Merge "applypatch: Clean up the function comments." am: 24e1321bc3
am: d4c1045d4e

Change-Id: Ib4cd5fca20313f7cf70c209119e5f8f4fdba19ef