Update Android makefile/config