C++17 is the default now.
am: fcb4afc887

Change-Id: Icadbbf358f60fb6af51fa0e5ac14aeef09daac09