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

Change-Id: I4c59280af2b5d3aad0911df7696e675a86cad701