am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit '371de9695508073fbbde8181eb230e99cb045206':
  Normalize output from aapt d