[automerger skipped] Merge "C2BufferQueueBlockPool: Fix swcodec crash in dtor...

[automerger skipped] Merge "C2BufferQueueBlockPool: Fix swcodec crash in dtor of GraphicBuffer" am: 809b7549 am: 30081bb4 am: 4fa3f0f6 am: d5ab1773 am: 2f1dd6b3 -s ours

am skip reason: Merged-In Ib74a43e87d53fd975c9a41702c7ae4cf5ae9deef with SHA-1 e451f235 is already in history

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

Change-Id: I335aceb0a0e4823aa83432b3e963894051c1944c