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

Change-Id: I8930911314a16c499c6c8ea1b005e3c3ea7d95fa