More Android/x86 porting