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

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