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

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