Merge "Remove unused zipalign macros"