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

Change-Id: I75f199f8bcbc027b09c20d47bad41f2813f705c1