Merge "Rely on the platform -std default."
am: 26989871a5

Change-Id: I1acbc09058a339d0df076e0fccb750bb57099e8d