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

Change-Id: I2f23db3ff90d9fcd541176af87bdff2b95cbf6ae