[automerger skipped] bufferpool2: Support mainline s/w codec am: e3d399b3ac am: 9db9300059 -s ours am: 8a5a05eeea -s ours am: 2738ed66d7 -s ours

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

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

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