Merge "Keep the ReadFileToString/ReadFdToString overhead down." am: 2af784bf20 am: 535520480a
am: d02302666f

Change-Id: I5fe24973065674d9922c62d3876f40f0f66f9c9d