Merge "Do not use deprecated StringBufferInputStream"