Merge "zipalign missing header" am: 94180579f7 am: 2421b1c099
am: 390b7a953e

Change-Id: If5da2d15b5dfb07cd44469d1a1c2e226a26dfb0d