Merge "C2AllocatorBlob: allow multiple maps"