Merge "AAPT2: Allow multiple -c flags" into oc-dev