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

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