Merge "zip_archive.cc: delete android_errorWriteLog" am: 832bd17a0b
am: 0ae7fe2d48

Change-Id: I9dbd292b0e0413dbee469e45d6ce4f66473c09e2