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

Change-Id: Iebe15bbb8e8a6412d777ff305f2f4d4aa9c8724e