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

* commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a':
  edify: Switch to C++.