am 94bf2b21: Merge change 27156 into eclair

Merge commit '94bf2b217df69e943843b51b0ea0bb72743cc6b3' into eclair-plus-aosp

* commit '94bf2b217df69e943843b51b0ea0bb72743cc6b3':
  DO NOT MERGE: Cleaning up PipedInputStream