Merge "AAPT2: Parse an ID encoded as a map" into oc-dev