Updated Android makefiles.