[automerger skipped] Merge "Mark media.bufferpool2 and media.c2 as...

[automerger skipped] Merge "Mark media.bufferpool2 and media.c2 as double-loadable" am: d62508c7 am: b6f7880b am: ba31a99f -s ours

am skip reason: Merged-In I89aa17b8f1db9393d506edd9f242112cd11a05ec with SHA-1 4f5dd1c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611868



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