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

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