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

Change-Id: I1ee905f0182adb92d25208ba06a847afaf1835ba