Merge "Permit 65535 byte ZIP comments and empty Central Directory"