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

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

Change-Id: I55e5b03a5199dd3ee88cfdbe02ac80ddcbd5c45d