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

Change-Id: Ic3862d558e257d65fb765aeb01fbe2795df22d18