Merge "Run zipalign after classes.dex is removed from the apk"