Merge "Do not run zipalign when re-signing APKs." am: 31066abfde
am: 95ba90d1f0

* commit '95ba90d1f0ded087683f9283b5c3538dd4f349d7':
  Do not run zipalign when re-signing APKs.