Merge "Fix CharArrayReader/StringBufferInputStream overflow" am: e6a019f653 am: afadb11900 am: 0f8f9cb138
am: 18f87ef307

Change-Id: Ie893500091b77a3b9e4405c85989b4202fbb95e0