Zipalign fixes