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

Change-Id: Iac67cf33d1bd51920cd06741f9e39ab3ccabf3b8