Merge changes from topic "c2allocatorbuf" am: 1e05a85fcf am: e00275b92d

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

Change-Id: I0f0db6e2b22cd6df5a50516dbc26220d874ecc3c