--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -12,21 +12,8 @@ include $(topsrcdir)/config/rules.mk
 TARGET_DEPTH = ../../..
 include $(topsrcdir)/build/automation-build.mk
 
 libs:: 
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
-
-# On Android only, include a release signed Robocop APK in the test package.
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-include $(topsrcdir)/config/android-common.mk
-
-robocop_apk := $(GRADLE_ANDROID_APP_ANDROIDTEST_APK)
-
-stage-package-android:
-	$(NSINSTALL) -D $(_DEST_DIR)
-	$(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(_DEST_DIR)/robocop.apk)
-
-stage-package: stage-package-android
-endif

--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -178,20 +178,17 @@ stage-config: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/config
 	@(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
 
 stage-mach: make-stage-dir
 	@(cd $(topsrcdir)/python/mach && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tools/mach && tar -xf -)
 	cp $(topsrcdir)/testing/tools/mach_test_package_bootstrap.py $(PKG_STAGE)/tools/mach_bootstrap.py
 	cp $(topsrcdir)/mach $(PKG_STAGE)
 
-stage-mochitest: make-stage-dir
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
-endif
+stage-mochitest: make-stage-dir ;
 
 stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
 ifdef OBJCOPY
 ifneq ($(OBJCOPY), :) # see build/autoconf/toolchain.m4:102 for why this is necessary
 ifndef PKG_SKIP_STRIP
 STRIP_COMPILED_TESTS := 1