Merge "Use AAPT2" into oc-dev