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

* commit '9c1954c43ab21994ed33198750b2551a1646a295':
  Run zipalign after classes.dex is removed from the apk