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

Change-Id: Ib729d49068b0ce6ff80941102023b3e2688abe59