Merge "Fix a native call to ZipFile#onZipEntryAccess()"