Merge "edify: Switch to C++."