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

Change-Id: I7bd0003df4bf8d8801a8c110a7b3915b4a55d67f