[automerger skipped] bufferpool2: Support mainline s/w codec am: e3d399b3 am: 9db93000 -s ours

am skip reason: Merged-In Id602b1a84880546ee726f36c247fabd2e4f2127c with SHA-1 34254e54 is already in history

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



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