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

Change-Id: I182bab95eb26b06d8d7a8f173519edae270660b2