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

Change-Id: Iaf0b06c21cc0321a98a3a28621e5e61c453c399d