am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."

* commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':