Merge "Fix reporting wrong error message for zipalign output file"