Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"