Merge "64bit cleanliness requires PRI*64 macros for stdint types."