Merge changes from topic "c2allocatorbuf" am: 1e05a85fcf

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

Change-Id: I59b276fd570edc5cf862c483462a5d86a278e5db