am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."

* commit '05c4b53eb53c069ebb2433947193f7d613e4ff04':