am b71386ed: am f38993ca: am 409b471e: Merge "Explicitly use an older C++ standard."

* commit 'b71386ed08a50cc50a7831507d9ba223487fd049':