Android: final cleanup of Makefile