Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a2 am:...

Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a2 am: 5351e4b3 am: 2c09c9f2 am: 69d5a7b7 am: 2d7ac5d1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16230693

Change-Id: Ie30467c2ebedfa3d64002cbbaedcd3fd82b665ee