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

Change-Id: I1eb649dc78bc6f509aa65208312c212e344a28ec