am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."

* commit '822685a8648e91aca6ce35992087c18165d4d609':