Speed up and expand auto-zipalign

Change-Id: I8222cb0eb101370174ebeb3a0fcb93ea8ffe7775