Merge "Remove unused zipalign macros" am: 56183c2ee2
am: e4a0dd15cc

Change-Id: Id086073bc8aaf01477ed8c360813929459110b40