Merge "zip_writer.cc: update powerof2 and use it unconditionally" am: b86e248e8b
am: 0fd9adf747

Change-Id: Id31eb3c2b8ae67dbe6c8d255879a6cc0543a5abe