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

Change-Id: I860f4afe7c4d1a63d7550f756bf6b4be90a16292