Android 7.1.2 Release 2 (N2G47E)
Fix cast from pointer to integer of different size am: b743e03c9b am: 911f176567
am: 452cd40d64

Change-Id: I8fcaf53cdd9fcc2fa34b606884ccb78acadda43b