Merge "C++14 is the default now." am: 933c5f2365 am: 26cb4f8dac
am: d9a50d724b

Change-Id: I331300c991a0b861ccbcfb09112410c8c4e7102b