Merge "Fix opt/chips for AAPT2" into oc-dev
am: 41b062f673

Change-Id: I085750267bebe2198163cc5a3ed0f2ca5de9fbd2