more android makefile mess