Merge "updater: Switch to C++ and fix the build."