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

Change-Id: I134bb7545bb8c42549285d5bc3a679e0ca1da0b2