am 93fa4b67: Merge "edify: Switch to C++."

* commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6':
  edify: Switch to C++.