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

Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a2 am: 136f9b1d am: 7b9c64f8 am: 79500045 am: f59acb0f am: 45738915

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

Change-Id: I282e1c067bb2920e3a94953641b031c93e03fe37