Merge "Mark media.bufferpool2 and media.c2 as double-loadable" am: d62508c79e am: b6f7880bad

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

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