More Android/x86 porting
Merge pull request #738 from joakim-noah/android

More Android/x86 porting