Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev