Merge "Fix integer overflow in MPEG4Extractor" am: 80fe08ba70 am: e537579361

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

Change-Id: I829c17e887730cb7808c76c1035c2a9dc0db5463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>