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

Change-Id: I6ef58ac2e23c56fad3883777b59e4918bbfef295