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

Change-Id: Ib75b6aeb6a9633e327d4533f25c68fc99323fb6d