diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -138,14 +138,14 @@
 
 macro(set_deprecated_variable actual_variable deprecated_variable default_value)
     set(${deprecated_variable} "${default_value}" CACHE STRING "Deprecated. Use ${actual_variable}")
-    if (NOT DEFINED ${actual_variable})
+    if (NOT DEFINED ${actual_variable} AND deprecated_value)
         set(${actual_variable} ${${deprecated_variable}})
     endif()
 endmacro()
 
 set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}")
 set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm")
-set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "4.9")
+set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION)
 set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a")
 set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14")