am: f4848f63 -s ours * commit 'f4848f63': DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.