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

Change-Id: Ib400aa3f9c993263791ea23ec2aa330bae99f99e