diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index c2f7381e7ac..f4b9770db25 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -198,7 +198,7 @@ class MachCommands(CommandBase):
         if verbose:
             opts += ["-v"]
         if android:
-            opts += ["--target", "arm-linux-androideabi"]
+            opts += ["--target", self.config["android"]["target"]]
 
         if debug_mozjs or self.config["build"]["debug-mozjs"]:
             features += ["script/debugmozjs"]
@@ -298,7 +298,6 @@ class MachCommands(CommandBase):
     def build_gonk(self, jobs=None, verbose=False, release=False):
         self.ensure_bootstrapped()
 
-        ret = None
         opts = []
         if jobs is not None:
             opts += ["-j", jobs]
@@ -307,7 +306,7 @@ class MachCommands(CommandBase):
         if release:
             opts += ["--release"]
 
-        opts += ["--target", "arm-linux-androideabi"]
+        opts += ["--target", self.config["android"]["target"]]
         env = self.build_env(gonk=True)
         build_start = time()
         with cd(path.join("ports", "gonk")):
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 4ceb5c629f4..e702d3f76e3 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -113,6 +113,7 @@ class CommandBase(object):
         self.config["android"].setdefault("sdk", "")
         self.config["android"].setdefault("ndk", "")
         self.config["android"].setdefault("toolchain", "")
+        self.config["android"].setdefault("target", "arm-linux-androideabi")
 
         self.config.setdefault("gonk", {})
         self.config["gonk"].setdefault("b2g", "")
@@ -145,8 +146,10 @@ class CommandBase(object):
         else:
             return path.join(self.context.topdir, "target")
 
-    def get_binary_path(self, release, dev):
+    def get_binary_path(self, release, dev, android=False):
         base_path = self.get_target_dir()
+        if android:
+            base_path = path.join(base_path, self.config["android"]["target"])
         release_path = path.join(base_path, "release", "servo")
         dev_path = path.join(base_path, "debug", "servo")
 
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py
index 5abffaeee4f..4d69e976e37 100644
--- a/python/servo/post_build_commands.py
+++ b/python/servo/post_build_commands.py
@@ -199,19 +199,18 @@ class PostBuildCommands(CommandBase):
         help="Command-line arguments to be passed through to Servo")
     def package(self, params, release=False, dev=False, debug=False, debugger=None):
         env = self.build_env()
-        target_dir = path.join(self.get_target_dir(), "arm-linux-androideabi")
-        dev_flag = ""
+        binary_path = self.get_binary_path(release, dev, android=True)
 
         if dev:
             env["NDK_DEBUG"] = "1"
             env["ANT_FLAVOR"] = "debug"
             dev_flag = "-d"
-            target_dir = path.join(target_dir, "debug")
         else:
             env["ANT_FLAVOR"] = "release"
-            target_dir = path.join(target_dir, "release")
+            dev_flag = ""
 
-        output_apk = path.join(target_dir, "servo.apk")
+        target_dir = os.path.dirname(binary_path)
+        output_apk = "{}.apk".format(binary_path)
         try:
             with cd(path.join("support", "android", "build-apk")):
                 subprocess.check_call(["cargo", "run", "--", dev_flag, "-o", output_apk, "-t", target_dir,