Merge "Do not run zipalign when building APK (except prebuilts)." am: b437f58006 am: fddfc2c604
am: 60d6e2eb00

* commit '60d6e2eb002b12c28c0f28527c020837adea9164':
  Do not run zipalign when building APK (except prebuilts).