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

Change-Id: I27e713e07ff0e547ab3f98fe4721113978f558ca