am f591c78e: (-s ours) am 94bf2b21: Merge change 27156 into eclair

Merge commit 'f591c78e3117dfbd727411386175bf1c1aef615b'

* commit 'f591c78e3117dfbd727411386175bf1c1aef615b':
  DO NOT MERGE: Cleaning up PipedInputStream