Merge "zip_archive.cc: Use static cast instead of masking" am: ba80ab1373
am: aa1367e924

Change-Id: I7c90c076f9dc535f3a962ae52a2b5da021fdb812