diff --git a/Dockerfile b/Dockerfile
index 28c92dd7bf97d2e51478ab7d18f6470d64471999..7da7cea812a2e5b7f08203ea10115c305b67e19b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -153,7 +153,7 @@ RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang c
       lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \
       libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \
       libxml2-utils lsof lzop maven pngcrush \
-      procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc yasm \
+      procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
       zip zlib1g-dev
 
 RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
diff --git a/src/build.sh b/src/build.sh
index b9add0c8e191c5fe3e7b0a2dcf30346244afd706..8dd89bcace99f1eb0d91cfb9d82a1135944d23c5 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -211,8 +211,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       if make systemimage; then
         build_success=true
       fi
-    elif [ "${USE_LUNCH}" = true ]; then
-      if lunch "${BRUNCH_DEVICE}" && mka && mka sdk_addon ; then
+    elif [ "${IS_EMULATOR}" = true ]; then
+      if lunch "${BRUNCH_DEVICE}" && mka sdk_addon ; then
         build_success=true
       fi
     elif brunch "${BRUNCH_DEVICE}"; then