Merge "The platform default is already newer than C++11." am: 287ce43dc4 am: 088bf6b896
am: 4d29392c7f

Change-Id: I3fb2e48982cbd5f9bf1712c5b9c4fae03d8d5487