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

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