am 25eb0464: Merge "Normalize output from aapt d"

* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d