diff --git a/Cargo.lock b/Cargo.lock
index 450263d7a8e..c627113b514 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3295,20 +3295,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 
-[[package]]
-name = "libmlservo"
-version = "0.0.1"
-dependencies = [
- "libc",
- "libservo",
- "log",
- "servo-egl",
- "simpleservo",
- "smallvec",
- "webxr",
- "webxr-api",
-]
-
 [[package]]
 name = "libservo"
 version = "0.0.1"
@@ -5380,15 +5366,6 @@ dependencies = [
  "time-point",
 ]
 
-[[package]]
-name = "servo-egl"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "servo-gst-plugin"
 version = "0.0.1"
diff --git a/Cargo.toml b/Cargo.toml
index 9e7b7265ddb..190f502fe00 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,6 @@ members = [
     "ports/gstplugin",
     "ports/libsimpleservo/capi/",
     "ports/libsimpleservo/jniapi/",
-    "ports/libmlservo/",
     "tests/unit/*",
 ]
 exclude = [".cargo"]
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index f27431fbadd..e7536ad4e30 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -866,6 +866,8 @@ install them, let us know by filing a bug!")
             assert self.handle_android_target(target)
         if android and not target:
             target = self.config["android"]["target"]
+        if target and not android:
+            android = self.handle_android_target(target)
         return target, android
 
     # A guess about which platforms should use the gstreamer media stack
@@ -919,6 +921,9 @@ install them, let us know by filing a bug!")
         if "-p" not in cargo_args:  # We're building specific package, that may not have features
             if self.config["build"]["debug-mozjs"] or debug_mozjs:
                 features.append("debugmozjs")
+
+            features.append("native-bluetooth")
+
             if uwp:
                 features.append("no-wgl")
                 features.append("uwp")