Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846
am: baa841ed04

Change-Id: Id2f21c231c57001b10d48472eea33d7d15ed8631