Merge "zip_writer.cc: update powerof2 and use it unconditionally"