diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 2a6943cbc2..44973f61ea 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -27,7 +27,7 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \
     unzip sdk.zip && \
     rm sdk.zip && \
     yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
+RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update
 # Install Android Build Tool and Libraries
 RUN $ANDROID_HOME/tools/bin/sdkmanager --update
 RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 64a374bbcf..6731d47742 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -32,8 +32,8 @@ if (BUILD_TOOLS)
     set_target_properties(oven PROPERTIES FOLDER "Tools")
 
     # No need to build on Android or in a Production build
-##    if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
+    if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
         add_subdirectory(nitpick)
         set_target_properties(nitpick PROPERTIES FOLDER "Tools")
-##    endif()
+    endif()
 endif()
diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index f019a5410f..9d5d38ec1f 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -76,9 +76,6 @@ elseif (WIN32)
 
     # add an executable that also has the icon itself and the configured rc file as resources
     add_executable(${TARGET_NAME} WIN32 ${NITPICK_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
-elseif (ANDROID)
-  # on android the target is a library that gets linked/used by the APK shell that qtcreateapk produces
-  add_library(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
 else ()
     add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM})
 endif ()