Fix cast from pointer to integer of different size
am: b743e03c9b

Change-Id: I9d890328fea434a503204ec2eb699e6fd81dadb7