Merge "C++14 has been the default for a while now."
am: d39da4944f

Change-Id: Id16d7fd6ba26d42ae7220a3fae8f1ec7066c18ef