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

Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63