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

* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
tree: a2e310240c5ce6b97701adb5fe3b0c494bf4e9fb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE