Android makefile cleanup