Merge "applypatch: Refactor applypatch()." am: af522672a2 am: 37521a9623
am: 7c83c139d6

Change-Id: I760b5159cc7bbe1ee5785447fbebb6650408e020