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

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

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



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