diff --git a/CMakeLists.txt b/CMakeLists.txt
index 127d4784..c075093c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,14 +95,6 @@ IF(APPLE)
    SET(CMAKE_LIBRARY_PATH "/opt/local/lib;${CMAKE_LIBRARY_PATH}")
 ENDIF()
 
-####### ANDROID_PREBUILD (early exit if true) #######
-OPTION( ANDROID_PREBUILD "Set to ON to build rtabmap resource build tool (required for android build)" OFF )
-IF(ANDROID_PREBUILD)
-   MESSAGE("Option ANDROID_PREBUILD is set, only rtabmap resource tool will be built. You can use android toolchain after that.")
-   ADD_SUBDIRECTORY( utilite )
-   return()
-ENDIF(ANDROID_PREBUILD)
-
 ####### Build libraries as shared or static #######
 OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
 
@@ -132,6 +124,15 @@ set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
   "Installation directory for CMake files")
   
 ####### BUILD OPTIONS #######
+
+# ANDROID_PREBUILD (early exit if true)
+OPTION( ANDROID_PREBUILD "Set to ON to build rtabmap resource build tool (required for android build)" OFF )
+IF(ANDROID_PREBUILD)
+   MESSAGE("Option ANDROID_PREBUILD is set, only rtabmap resource tool will be built. You can use android toolchain after that.")
+   ADD_SUBDIRECTORY( utilite )
+   return()
+ENDIF(ANDROID_PREBUILD)
+
 IF(APPLE)
     OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
 ENDIF(APPLE)
diff --git a/docker/xenial/android/Dockerfile b/docker/xenial/android/Dockerfile
index cddad9ff..5387a750 100644
--- a/docker/xenial/android/Dockerfile
+++ b/docker/xenial/android/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR /root/
 
 ADD setup_android_env.bash /root/setup_android_env.bash
 RUN chmod +x setup_android_env.bash
-RUN /bin/bash -c "./setup_android_env.bash /opt"
+RUN /bin/bash -c "./setup_android_env.bash"
 
 ADD install_deps.bash /root/install_deps.bash
 RUN chmod +x install_deps.bash
diff --git a/docker/xenial/android/tango/build.bash b/docker/xenial/android/tango/build.bash
index 8a07a392..4a639887 100644
--- a/docker/xenial/android/tango/build.bash
+++ b/docker/xenial/android/tango/build.bash
@@ -32,7 +32,6 @@ wget https://developers.google.com/tango/downloads/TangoSDK_Ikariotikos_Java.jar
 mv TangoSDK_Ikariotikos_Java.jar rtabmap-tango/app/android/libs/.
 
 # resource tool
-mkdir rtabmap-tango/build
 cd rtabmap-tango/build
 cmake --DANDROID_PREBUILD=ON ..
 make