Simplify the android makefile