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

* commit '31066abfde08abdefe00be67074a2c7401917f97':
  Do not run zipalign when re-signing APKs.