Merge "Updated mtp_fuzzer" am: d5fdf9c3 am: ceda32b8 am: aee51cc9 am:...

Merge "Updated mtp_fuzzer" am: d5fdf9c3 am: ceda32b8 am: aee51cc9 am: 3cca5ba1 am: 4253bdb3

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



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