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

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

Change-Id: Idba61e379fafa43754375b50afdde44eceb0e71f