am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."

* commit 'aec922426620804768f00a6c5cb902f278f2967f':
  Replace all instances of intptr_t with uintptr_t.