Merge "AAPT2: Ignore namespaced elements in AndroidManifest.xml" into oc-dev