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

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

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