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

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

Change-Id: I3ae9d52bf0be17875ee8cf2ff396688241a931aa