Merge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e
am: 163196aa48

* commit '163196aa481eb8d279822ff93027526ca2c189c1':
  Use explicitly sized types in zipalign/ziptime