Added x86 support for Android
Fixed dup defs in CMakeFile.txt
Merge pull request #1601 from seanpaultaylor/next

Next