Merge pull request #188 from fsb4000/android-x86