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

Change-Id: Iec2bb8402da4c20a958e2e6cf3bc4b420bd8f4b9