Changes for 64-bit Android