More android support
Conflicts:
	Makefile.in
	cmakeFiles/rustllvm.cmake