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

Change-Id: If2102bc2fb05a6708b6aea72dbe5697a35f9e6fa