diff --git a/external/android-emugl/Android.mk b/external/android-emugl/Android.mk
deleted file mode 100644
index d858e69..0000000
--- a/external/android-emugl/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-# This is the top-level build file for the Android HW OpenGL ES emulation
-# in Android.
-#
-# You must define BUILD_EMULATOR_HOST_OPENGL to 'true' in your environment to
-# build the following files.
-#
-# Top-level for all modules
-EMUGL_PATH := $(call my-dir)
-
-EMUGL_OLD_LOCAL_PATH := $(LOCAL_PATH)
-
-# Directory containing common headers that are part of EmuGL's public API.
-# This is always set to a module's LOCAL_C_INCLUDES. See the definition of
-# emugl-begin-module in common.mk
-EMUGL_COMMON_INCLUDES := $(EMUGL_INCLUDES)
-
-# common cflags used by several modules
-# This is always set to a module's LOCAL_CFLAGS
-# See the definition of emugl-begin-module in common.mk
-
-# Needed to ensure SIZE_MAX is properly defined when including <stdint.h>
-EMUGL_COMMON_CFLAGS += -D__STDC_LIMIT_MACROS=1
-
-ifneq (,$(strip $(BUILD_DEBUG)))
-EMUGL_COMMON_CFLAGS += -DEMUGL_DEBUG=1
-endif
-
-EMUGL_COMMON_CFLAGS += -DEMUGL_BUILD=1
-ifeq (linux,$(BUILD_TARGET_OS))
-EMUGL_COMMON_CFLAGS += -fvisibility=internal
-endif
-ifeq (darwin,$(BUILD_TARGET_OS))
-EMUGL_COMMON_CFLAGS += -fvisibility=hidden
-endif
-
-# Include common definitions used by all the modules included later
-# in this build file. This contains the definition of all useful
-# emugl-xxxx functions.
-#
-include $(EMUGL_PATH)/common.mk
-
-# IMPORTANT: ORDER IS CRUCIAL HERE
-#
-# For the import/export feature to work properly, you must include
-# modules below in correct order. That is, if module B depends on
-# module A, then it must be included after module A below.
-#
-# This ensures that anything exported by module A will be correctly
-# be imported by module B when it is declared.
-#
-# Note that the build system will complain if you try to import a
-# module that hasn't been declared yet anyway.
-#
-
-# Required by our units test.
-include $(EMUGL_PATH)/googletest.mk
-
-# First, build the emugen host source-generation tool
-#
-# It will be used by other modules to generate wire protocol encode/decoder
-# source files (see all emugl-gen-decoder/encoder in common.mk)
-#
-include $(EMUGL_PATH)/host/tools/emugen/Android.mk
-
-include $(EMUGL_PATH)/shared/emugl/common/Android.mk
-include $(EMUGL_PATH)/shared/OpenglCodecCommon/Android.mk
-
-ifeq (true,$(EMULATOR_USE_ANGLE))
-# Alternative graphics translation (GT) implementation, stripped off
-# and adjust from the equivalent mod in the ARC project.
-# This GT acts as a thin wrapper + GLESv1-to-v2 translator
-# and forwards GLES calls to underlying GLES API (e.g. ANGLE)
-#
-include $(EMUGL_PATH)/host/libs/graphics_translation/common/Android.mk
-include $(EMUGL_PATH)/host/libs/graphics_translation/gles/Android.mk
-endif
-
-# Host static libraries
-include $(EMUGL_PATH)/host/libs/GLESv1_dec/Android.mk
-include $(EMUGL_PATH)/host/libs/GLESv2_dec/Android.mk
-include $(EMUGL_PATH)/host/libs/renderControl_dec/Android.mk
-include $(EMUGL_PATH)/host/libs/Translator/GLcommon/Android.mk
-include $(EMUGL_PATH)/host/libs/Translator/GLES_CM/Android.mk
-include $(EMUGL_PATH)/host/libs/Translator/GLES_V2/Android.mk
-include $(EMUGL_PATH)/host/libs/Translator/EGL/Android.mk
-include $(EMUGL_PATH)/host/libs/libOpenGLESDispatch/Android.mk
-
-# Host shared libraries
-include $(EMUGL_PATH)/host/libs/libOpenglRender/Android.mk
-
-LOCAL_PATH := $(EMUGL_OLD_LOCAL_PATH)
diff --git a/external/android-emugl/host/libs/GLESv1_dec/Android.mk b/external/android-emugl/host/libs/GLESv1_dec/Android.mk
deleted file mode 100644
index 55aa8af..0000000
--- a/external/android-emugl/host/libs/GLESv1_dec/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-### host library #########################################
-$(call emugl-begin-host-static-library,libGLESv1_dec)
-
-$(call emugl-import, libOpenglCodecCommon)
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-$(call emugl-gen-decoder,$(LOCAL_PATH),gles1)
-
-LOCAL_SRC_FILES := GLESv1Decoder.cpp
-
-$(call emugl-export,CFLAGS,$(EMUGL_USER_CFLAGS))
-$(call emugl-export,LDLIBS,$(CXX_STD_LIB))
-
-$(call emugl-end-module)
diff --git a/external/android-emugl/host/libs/GLESv2_dec/Android.mk b/external/android-emugl/host/libs/GLESv2_dec/Android.mk
deleted file mode 100644
index 711b17c..0000000
--- a/external/android-emugl/host/libs/GLESv2_dec/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-### host library ##########################################
-$(call emugl-begin-host-static-library,libGLESv2_dec)
-$(call emugl-import, libOpenglCodecCommon)
-$(call emugl-gen-decoder,$(LOCAL_PATH),gles2)
-
-# For gl2_types.h !
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-$(call emugl-export,CFLAGS,$(EMUGL_USER_CFLAGS))
-
-LOCAL_SRC_FILES := GLESv2Decoder.cpp
-
-$(call emugl-end-module)
diff --git a/external/android-emugl/host/libs/libOpenGLESDispatch/Android.mk b/external/android-emugl/host/libs/libOpenGLESDispatch/Android.mk
deleted file mode 100644
index 0922628..0000000
--- a/external/android-emugl/host/libs/libOpenGLESDispatch/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-### host library ##########################################
-$(call emugl-begin-host-static-library,libOpenGLESDispatch)
-$(call emugl-import,libGLESv2_dec libGLESv1_dec)
-
-# use Translator's egl headers
-LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include
-LOCAL_C_INCLUDES += $(EMUGL_PATH)/shared
-
-LOCAL_SRC_FILES := EGLDispatch.cpp \
-                   GLESv2Dispatch.cpp \
-                   GLESv1Dispatch.cpp
-$(call emugl-end-module)
diff --git a/external/android-emugl/host/libs/libOpenglRender/Android.mk b/external/android-emugl/host/libs/libOpenglRender/Android.mk
deleted file mode 100644
index d98a714..0000000
--- a/external/android-emugl/host/libs/libOpenglRender/Android.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-host_OS_SRCS :=
-host_common_LDLIBS :=
-
-ifeq ($(BUILD_TARGET_OS),linux)
-    host_OS_SRCS = NativeSubWindow_x11.cpp
-    host_common_LDLIBS += -lX11 -lrt
-endif
-
-ifeq ($(BUILD_TARGET_OS),darwin)
-    host_OS_SRCS = NativeSubWindow_cocoa.m
-    host_common_LDLIBS += -Wl,-framework,AppKit
-endif
-
-ifeq ($(BUILD_TARGET_OS),windows)
-    host_OS_SRCS = NativeSubWindow_win32.cpp
-    host_common_LDLIBS += -lgdi32
-endif
-
-host_common_SRC_FILES := \
-    $(host_OS_SRCS) \
-    ColorBuffer.cpp \
-    FbConfig.cpp \
-    FrameBuffer.cpp \
-    ReadBuffer.cpp \
-    RenderContext.cpp \
-    RenderControl.cpp \
-    RenderServer.cpp \
-    RenderThread.cpp \
-    RenderThreadInfo.cpp \
-    render_api.cpp \
-    RenderWindow.cpp \
-    SocketStream.cpp \
-    TcpStream.cpp \
-    TextureDraw.cpp \
-    TextureResize.cpp \
-    TimeUtils.cpp \
-    WindowSurface.cpp \
-
-ifeq ($(BUILD_TARGET_OS),windows)
-    host_common_SRC_FILES += Win32PipeStream.cpp
-    host_common_LDLIBS += -lws2_32 -lpsapi
-else
-    host_common_SRC_FILES += UnixStream.cpp
-endif
-
-### host libOpenglRender #################################################
-$(call emugl-begin-host-shared-library,lib$(BUILD_TARGET_SUFFIX)OpenglRender)
-
-$(call emugl-import,libGLESv1_dec libGLESv2_dec lib_renderControl_dec libOpenglCodecCommon)
-
-LOCAL_LDLIBS += $(host_common_LDLIBS)
-
-LOCAL_SRC_FILES := $(host_common_SRC_FILES)
-$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include)
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-# use Translator's egl/gles headers
-LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include
-LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/libOpenGLESDispatch
-
-LOCAL_STATIC_LIBRARIES += libemugl_common
-LOCAL_STATIC_LIBRARIES += libOpenGLESDispatch
-
-LOCAL_SYMBOL_FILE := render_api.entries
-
-$(call emugl-export,CFLAGS,$(EMUGL_USER_CFLAGS))
-
-$(call emugl-end-module)
diff --git a/external/android-emugl/host/libs/renderControl_dec/Android.mk b/external/android-emugl/host/libs/renderControl_dec/Android.mk
deleted file mode 100644
index 64c9507..0000000
--- a/external/android-emugl/host/libs/renderControl_dec/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-
-### host library ############################################
-$(call emugl-begin-host-static-library,lib_renderControl_dec)
-$(call emugl-import,libOpenglCodecCommon)
-$(call emugl-gen-decoder,$(LOCAL_PATH),renderControl)
-# For renderControl_types.h
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-$(call emugl-end-module)
diff --git a/external/android-emugl/host/tools/emugen/Android.mk b/external/android-emugl/host/tools/emugen/Android.mk
deleted file mode 100644
index 78d17d6..0000000
--- a/external/android-emugl/host/tools/emugen/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Determine if the emugen build needs to be builts from
-# sources.
-LOCAL_PATH:=$(call my-dir)
-
-$(call emugl-begin-host-executable,emugen)
-
-LOCAL_SRC_FILES := \
-    ApiGen.cpp \
-    EntryPoint.cpp \
-    main.cpp \
-    Parser.cpp \
-    strUtils.cpp \
-    TypeFactory.cpp \
-
-LOCAL_HOST_BUILD := true
-LOCAL_INSTALL := false
-
-$(call emugl-end-module)
-
-# The location of the emugen host tool that is used to generate wire
-# protocol encoders/ decoders. This variable is used by other emugl modules.
-EMUGL_EMUGEN := $(LOCAL_BUILT_MODULE)
-
-$(call emugl-begin-host-executable,emugen_unittests)
-LOCAL_SRC_FILES := \
-    Parser.cpp \
-    Parser_unittest.cpp
-LOCAL_HOST_BUILD := true
-LOCAL_INSTALL := false
-$(call emugl-import,libemugl_gtest_host)
-$(call emugl-end-module)
diff --git a/external/android-emugl/shared/OpenglCodecCommon/Android.mk b/external/android-emugl/shared/OpenglCodecCommon/Android.mk
deleted file mode 100644
index fff14ec..0000000
--- a/external/android-emugl/shared/OpenglCodecCommon/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# This build script corresponds to a library containing many definitions
-# common to both the guest and the host. They relate to
-#
-LOCAL_PATH := $(call my-dir)
-
-commonSources := \
-        glUtils.cpp \
-        ChecksumCalculator.cpp \
-        ChecksumCalculatorThreadInfo.cpp \
-
-host_commonSources := $(commonSources)
-
-host_commonLdLibs := $(CXX_STD_LIB)
-
-### OpenglCodecCommon  host ##############################################
-$(call emugl-begin-host-static-library,libOpenglCodecCommon)
-
-LOCAL_SRC_FILES := $(host_commonSources)
-$(call emugl-import, libemugl_common)
-$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH))
-$(call emugl-export,LDLIBS,$(host_commonLdLibs))
-$(call emugl-end-module)
-
-
diff --git a/external/android-emugl/shared/emugl/common/Android.mk b/external/android-emugl/shared/emugl/common/Android.mk
deleted file mode 100644
index a6c6a90..0000000
--- a/external/android-emugl/shared/emugl/common/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# This build script corresponds to a library containing many definitions
-# common to both the guest and the host. They relate to
-#
-LOCAL_PATH := $(call my-dir)
-
-### emugl_common host library ###########################################
-
-commonSources := \
-        crash_reporter.cpp \
-        id_to_object_map.cpp \
-        lazy_instance.cpp \
-        logging.cpp \
-        message_channel.cpp \
-        pod_vector.cpp \
-        shared_library.cpp \
-        smart_ptr.cpp \
-        sockets.cpp \
-        thread_store.cpp \
-
-host_commonSources := $(commonSources)
-
-host_commonLdLibs := $(CXX_STD_LIB)
-
-ifneq (windows,$(BUILD_TARGET_OS))
-    host_commonSources += \
-        thread_pthread.cpp \
-
-    host_commonLdLibs += -ldl -lpthread
-else
-    host_commonSources += \
-        condition_variable_win32.cpp \
-        thread_win32.cpp \
-
-endif
-
-$(call emugl-begin-host-static-library,libemugl_common)
-LOCAL_SRC_FILES := $(host_commonSources)
-$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared)
-$(call emugl-export,LDLIBS,$(host_commonLdLibs))
-$(call emugl-end-module)
-
-### emugl_common_unittests ##############################################
-
-host_commonSources := \
-    condition_variable_unittest.cpp \
-    id_to_object_map_unittest.cpp \
-    lazy_instance_unittest.cpp \
-    pod_vector_unittest.cpp \
-    message_channel_unittest.cpp \
-    mutex_unittest.cpp \
-    shared_library_unittest.cpp \
-    smart_ptr_unittest.cpp \
-    thread_store_unittest.cpp \
-    thread_unittest.cpp \
-    unique_integer_map_unittest.cpp \
-
-$(call emugl-begin-host-executable,emugl$(BUILD_TARGET_SUFFIX)_common_host_unittests)
-LOCAL_SRC_FILES := $(host_commonSources)
-$(call emugl-import,libemugl_common libemugl_gtest)
-$(call emugl-end-module)
-
-$(call emugl-begin-host-shared-library,lib$(BUILD_TARGET_SUFFIX)emugl_test_shared_library)
-LOCAL_SRC_FILES := testing/test_shared_library.cpp
-LOCAL_CFLAGS := -fvisibility=default
-$(call emugl-end-module)