Merge "Add Zopfli-recompress option to zipalign"