fix makefiles for Android build system and remove files we don't need