Merge "AAPT2: fixing the -c flag being ignored" into oc-dev