Merge "AAPT2: Change XmlDom to exclude Namespace as a node"