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

* commit 'cd927519a94939f2ebc307544f827baade529bc9':
  Fix stdint.h intptr_t/uintptr_t for x86_64/x32