Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7 am: 30124b4e1e
am: 011d40c669

Change-Id: I6a16e4f3cd614e581b5f85330e7f589466f4d268