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

* commit '31428917bc781bbd802048c574488a9e9437c830':
  Run zipalign after classes.dex is removed from the apk