am d163c8ed: am 781a83ae: am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"

* commit 'd163c8eda25ff1c2e4de5a981331ab7e77aaeea1':
  Fix reporting wrong error message for zipalign output file