diff --git a/Makefile.android b/Makefile.android
index e377549..739143a 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -110,13 +110,17 @@
   # which contains the relevant headers and 32-bit libraries for audio (The host 64-bit
   # Lucid doesn't provide these anymore, only their 64-bit versions).
   ifeq ($(HOST_OS),linux)
-    HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
+    HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-
+    ifeq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)gcc)))
+      # fallback to the previous host toolchain if new one isn't available
+      HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk/
+    endif
     # Don't do anything if the toolchain is not there
-    ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc)))
-      MY_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc
-      MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)/g++
-      MY_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)/ar
-    endif # $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc exists
+    ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)gcc)))
+      MY_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)gcc
+      MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)g++
+      MY_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)ar
+    endif # $(HOST_SDK_TOOLCHAIN_PREFIX)gcc exists
   endif # HOST_OS == linux
 
   ifneq ($(USE_CCACHE),)
diff --git a/android-configure.sh b/android-configure.sh
index 46fca51..e7abc38 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -106,7 +106,10 @@
 # On Linux, try to use our prebuilt toolchain to generate binaries
 # that are compatible with Ubuntu 8.04
 if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux ] ; then
-    PROBE_HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
+    PROBE_HOST_CC=`dirname $0`/../../prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-gcc
+    if [ ! -f "$PROBE_HOST_CC" ] ; then
+        PROBE_HOST_CC=`dirname $0`/../../prebuilts/tools/gcc-sdk/gcc
+    fi
     if [ -f "$PROBE_HOST_CC" ] ; then
         echo "Using prebuilt toolchain: $PROBE_HOST_CC"
         CC="$PROBE_HOST_CC"