Merge "MPEG4Writer: remove duplicate include" am: 49ada8fa am: de4cadb1...

Merge "MPEG4Writer: remove duplicate include" am: 49ada8fa am: de4cadb1 am: fa888e36 am: 52921c5b am: 53633dd6

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



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