Merge "Change all uintptr_t to uint64_t in API."
am: e20b4a48fe

Change-Id: Id0bb2e33e87a6889ded796fc29fdb6a273d4c5ff