am c2341e3b: am 581cc1ee: Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev

* commit 'c2341e3b557e6de2627032488d91ed4188119003':
  AAPT2: Change xml file parsing to DOM based