Merge "Fix opt/chips for AAPT2" into oc-dev