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

Change-Id: I5c28b79b348316bde930d99d914fc8da07336f24