Start getting tests passing on Android/x86
Merge pull request #2150 from joakim-noah/android

Get tests passing on Android/x86