Merge "clang and C++14 are the defaults now." am: d8bffa3ad9
am: 133bd69a13

Change-Id: I9de03f6730fc6974f4be65624bfb476bb65b633b