diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 2460d5dc7..118ed1c50 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -15,27 +15,9 @@
 #
 
 ##############################################################################
-# Platform Tools Component
+# Docs Component
 ##############################################################################
 
-
-
-##############################################################################
-# Tools Component
-# Legacy: this should be moved to sdk/build/tools.atree
-##############################################################################
-
-# swt
-prebuilt/darwin-x86/swt/swt.jar tools/lib/x86/swt.jar
-prebuilt/darwin-x86_64/swt/swt.jar tools/lib/x86_64/swt.jar
-
-
-# JetCreator (only available on mac/windows)
-external/sonivox/jet_tools/JetCreator tools/Jet/JetCreator
-prebuilt/darwin-x86/jetcreator/libEASLIb.dylib tools/Jet/JetCreator/libEASLIb.dylib
-external/sonivox/jet_tools/JetCreator_content tools/Jet/demo_content
-external/sonivox/jet_tools/logic_templates tools/Jet/logic_templates
-
 external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
 external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files
 external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 1a9a89014..e21785e4b 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -14,17 +14,4 @@
 # limitations under the License.
 #
 
-##############################################################################
-# Platform Tools Component
-##############################################################################
 
-
-
-##############################################################################
-# Tools Component
-# Legacy: this should be moved to sdk/build/tools.atree
-##############################################################################
-
-# swt
-prebuilt/linux-x86/swt/swt.jar tools/lib/x86/swt.jar
-prebuilt/linux-x86_64/swt/swt.jar tools/lib/x86_64/swt.jar
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 3144b2711..2eee75da0 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -48,13 +48,6 @@ bin/dexdump.exe                         strip platform-tools/dexdump.exe
 rm platform-tools/llvm-rs-cc
 bin/llvm-rs-cc.exe                      strip platform-tools/llvm-rs-cc.exe
 
-prebuilt/windows/swt/swt.jar                  tools/lib/x86/swt.jar
-prebuilt/windows-x86_64/swt/swt.jar           tools/lib/x86_64/swt.jar
-
-external/sonivox/jet_tools/JetCreator                 tools/Jet/JetCreator
-external/sonivox/jet_tools/JetCreator_content         tools/Jet/demo_content
-external/sonivox/jet_tools/logic_templates            tools/Jet/logic_templates
-prebuilt/windows/jetcreator/EASDLL.dll                tools/Jet/JetCreator/EASDLL.dll
 external/sonivox/docs/JET_Authoring_Guidelines.html   docs/JetCreator/JET_Authoring_Guidelines.html
 external/sonivox/docs/JET_Authoring_Guidelines_files  docs/JetCreator/JET_Authoring_Guidelines_files
 external/sonivox/docs/JET_Creator_User_Manual.html    docs/JetCreator/JET_Creator_User_Manual.html
diff --git a/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk b/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
index 52a1c8e97..9c4cfdda3 100644
--- a/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
+++ b/tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
@@ -6,7 +6,7 @@ $(call emugl-import,libOpenglRender event_injector)
 LOCAL_SRC_FILES := main.cpp
 
 PREBUILT := $(HOST_PREBUILT_TAG)
-LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
+LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
 LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
 LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))
 
diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
index a73f6b808..77cd272ba 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
@@ -4,7 +4,7 @@ $(call emugl-begin-host-executable,triangleCM)
 $(call emugl-import,libEGL_translator libGLES_CM_translator)
 
 PREBUILT := $(HOST_PREBUILT_TAG)
-LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
+LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
 LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
 LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))
 
diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
index efbe6bd02..53f774ce0 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
@@ -4,7 +4,7 @@ $(call emugl-begin-host-executable,triangleV2)
 $(call emugl-import,libEGL_translator libGLES_V2_translator)
 
 PREBUILT := $(HOST_PREBUILT_TAG)
-LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config
+LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
 LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
 LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))