Android 7.1.1 release 7
Fix cast from pointer to integer of different size am: b743e03c9b
am: 911f176567

Change-Id: I80b30347c5aaa56cae29ed0ebc4d7af027856abf