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

Change-Id: I5bb373c28a66bdd15ad6fca23e9d12427cce6dbc