Merge "Fix <inttypes.h> declaration for pointer-related PRI/SCN macros."