Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7