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

* commit '1a42ebc16e68d18394f613145aca7d8fd88f2588':