improved android makefile