Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a29f am: 5351e4b349 am: 2c09c9f20e am: 69d5a7b78b

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

Change-Id: Icb184d10e5b62c8f5a340698b7d09df8ce3fa72d