Merge changes from topic "c2allocatorbuf" am: 1e05a85fcf am: e00275b92d am: 86570edfaa am: 9c9766b093

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

Change-Id: Ie299035ffdb67bcbfa50ddc460843bb35cc3ce80