Merge changes I8141223d,I54182d7b

* changes:
  Android patch: Patch Zip64SizeTest to be passing on Android
  Merge Zip64SizeTest