Update for updater and Android makefiles