Merge "Enable -Werror on zipalign"