DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1  -s ours
am: f4848f63ad  -s ours

* commit 'f4848f63ad6041fcc01ad1f520ccc0ceddd80f61':
  DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.