am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"

* commit 'c1c55afb474dd85a6205bc8ab94065f3ac38aa77':
  Normalize output from aapt d xmltree