am 1f87d3ab: am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."

* commit '1f87d3ab8c384d03d1496c63f7faad15bd5eeba9':
  Add guards to prevent typedefs when C++11 is available.