As a follow up for 024e4f16ca795b98a5dea371cab623f851858925. This should fix builders defaulting to pre-c++17. E.g. https://lab.llvm.org/buildbot/#/builders/139/builds/34918
Differential Revision: https://reviews.llvm.org/D137415