[automerger skipped] Merge "Fix heap-buffer-overflow in MPEG4Extractor" into sc-dev am: 031ae61d am: 7b7e1d7f -s ours

am skip reason: Merged-In I31f2b9a4f1b561c4466c76ea2af8dd532622102a with SHA-1 1d5c36d8 is already in history

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

Change-Id: I64fc9b2a1927d99316ea15b61b43754afa32b1d6