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

Change-Id: Ia6e953937e1d23f165b51ca759568efb53e9c9db