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

Change-Id: Ie70a8414a18c0f8b8bb4054545bc7dc74c99838c