Merge "C++14 is the default now." am: 92d1a5f825
am: 83ef0d97ad

Change-Id: Ic144fd60ed3f294ab0ebc0ec523419e9ffc1eac9