Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."