Merge "C2AllocatorBlob: allow multiple maps" into mainline-prod