Merge "AAPT2: Parse an ID encoded as a map" into oc-dev am: c26ace0754
am: 719349cdb3

Change-Id: Icab08b15c92a8b88b7348e0caf61dba2f025de1b