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

Change-Id: Iee7ddf4af4e79e7d17a68ab438fef8f7c7ed5b3f