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

Change-Id: I8f5174d3504ab6b823d197e6a0ca74b734e3426c