am 9a35ef1b: Guarantee deflaters get cleaned up, even if subclassed.

Merge commit '9a35ef1b4b196f0479054993ab0eabac416c5214' into eclair-mr2-plus-aosp

* commit '9a35ef1b4b196f0479054993ab0eabac416c5214':
  Guarantee deflaters get cleaned up, even if subclassed.