Merge "Remove dependency on InflaterInputStream.closed field." am: 555fc87b99
am: 6565aae0e9

Change-Id: Ifdb606d1a4e60347ad4d36518901a6feafc070bc