Merge "C++14 is the default now."
am: 933c5f2365

Change-Id: If6589c5e1071314ff5947ec7a2747a5165da531c