Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9 am: 839c40513a
am: d9f532e7a2

Change-Id: I87cf9ea66c3a8a7632650bf8f740a2aa8a959e9c