Merge "C2AllocatorBlob: allow multiple maps" am: ea8fec6c31 am: 80cedbdebe am: 5ffb3ef0be

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

Change-Id: Ib85f62f37d4d5131f455ac5a32a806146445b840