am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"
am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"

* commit '93cdbd0b81e96649ebb789710429388c054bc377':
  Run zipalign after classes.dex is removed from the apk

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build