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