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

Change-Id: I70c23fb1e51c5dc585b2e969e8c11bea61c4073a