Merge "MPEG4Writer: remove duplicate include" am: 49ada8fa1b am: de4cadb1e9 am: fa888e36e3

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

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