Merge "Inflater: Revert ensureOpen() changes to upstream 8u121-b13"