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

Change-Id: Ib678a1af32e8d6a0d68672099ccf06b088780541