Merge "codec2: fix gralloc4 mapping" am: 830aea3c am: acf09b39 am:...

Merge "codec2: fix gralloc4 mapping" am: 830aea3c am: acf09b39 am: ff18a43c am: f47040e0 am: b617c4bf

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



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