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

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