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