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

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