Merge "C++14 is the default now." am: c85724298e am: d53231a511 am: 9e2569e26a
am: a1ecbec1dd

Change-Id: Iebcbac7aaa3fbaf95ddf330c562908978344eb63