diff --git a/config/rules.mk b/config/rules.mk
index bdeb86d599c..89ec102fa51 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1636,9 +1636,9 @@ chrome::
 $(FINAL_TARGET)/chrome:
 	$(NSINSTALL) -D $@
 
-libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
 ifneq (,$(wildcard $(JAR_MANIFEST)))
 ifndef NO_DIST_INSTALL
+libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
 	$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
 	  $(QUIET) -j $(FINAL_TARGET)/chrome \
 	  $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index fed88714553..99e116288ec 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -602,7 +602,6 @@ abstract public class GeckoApp
             Log.w(LOG_FILE_NAME, "error removing files", ex);
         }
         unpackFile(zip, buf, null, "application.ini");
-        unpackFile(zip, buf, null, getContentProcessName());
         try {
             unpackFile(zip, buf, null, "update.locale");
         } catch (Exception e) {/* this is non-fatal */}
diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in
index c7ac94bdf0c..85fd62f4997 100644
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -47,6 +47,13 @@ MODULE = ipc
 include $(topsrcdir)/ipc/app/defs.mk
 PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
 
+$(PROGRAM): $(dir $(PROGRAM))
+
+$(dir $(PROGRAM)):
+	mkdir $@
+
+GARBAGE_DIRS += $(dir $(PROGRAM))
+
 CPPSRCS = \
   MozillaRuntimeMain.cpp \
   $(NULL)
@@ -79,6 +86,10 @@ NSDISTMODE = copy
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
+ifeq ($(OS_TARGET),Android)
+FINAL_TARGET = $(DIST)/bin/lib
+endif
+
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
diff --git a/ipc/app/defs.mk b/ipc/app/defs.mk
index 90a2ef87b50..b54b351ad81 100644
--- a/ipc/app/defs.mk
+++ b/ipc/app/defs.mk
@@ -34,5 +34,13 @@
 #
 # ***** END LICENSE BLOCK *****
 
+ifneq ($(OS_TARGET),Android)
 MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX)
+else
+# We want to let Android unpack the file at install time, but it only does
+# so if the file is named libsomething.so. The lib/ path is also required
+# because the unpacked file will be under the lib/ subdirectory and will
+# need to be executed from that path.
+MOZ_CHILD_PROCESS_NAME := lib/libplugin-container.so
+endif
 MOZ_CHILD_PROCESS_BUNDLE := plugin-container.app/Contents/MacOS/
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index bdeb86d599c..89ec102fa51 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1636,9 +1636,9 @@ chrome::
 $(FINAL_TARGET)/chrome:
 	$(NSINSTALL) -D $@
 
-libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
 ifneq (,$(wildcard $(JAR_MANIFEST)))
 ifndef NO_DIST_INSTALL
+libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
 	$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
 	  $(QUIET) -j $(FINAL_TARGET)/chrome \
 	  $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 98f232ced67..9884223d33c 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -324,9 +324,8 @@ INNER_MAKE_PACKAGE	= \
   make -C ../embedding/android gecko.ap_ && \
   cp ../embedding/android/gecko.ap_ $(_ABS_DIST) && \
   ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
-    rm -rf lib && \
     mkdir -p lib/$(ABI_DIR) && \
-    mv libmozutils.so lib/$(ABI_DIR) && \
+    mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \
     rm -f lib.id && \
     for SOMELIB in *.so ; \
     do \