am 76218efb: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."

* commit '76218efbeb2e124656ce15d4eb5a7039da065123':
  Fix inttypes.h and stdint.h for 64-bit (and C++11).