Moved android to sub-project

Also reworked ant build a bit.