Merge "Allow C++17 in fastboot." am: 088d18e619
am: 07ffa5b1f1

Change-Id: I97441609e94d4fd50ead6b8c2926ea3f7c51e143