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

Change-Id: I786d4e22b69b11369b5c8786b19a23d123706a27