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

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

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