am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles

Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles