diff --git a/Makefile.in b/Makefile.in
index d5c5e186f10..5b4f2e39ebe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -409,7 +409,7 @@ package: servo
 else ifeq ($(CFG_OSTYPE),linux-androideabi)
 package: servo
 	mkdir -p sofile
-	find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET)/src/compiler/rust' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/
+	find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET)/src/compiler/rust' -o -path '*/host' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/
 	find $(CFG_RUST_HOME)/lib/rustlib/$(CFG_TARGET)/lib/ -name '*.so' -type f -size +1c | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/
 	cd $(S)src/platform/android/servo-android-glue && make with-libs
 	cd $(CFG_BUILD_HOME)
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index 944df69bd43..87f7203ae40 100644
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -53,7 +53,7 @@ use servo_util::opts;
 use url::{Url, UrlParser};
 
 
-#[cfg(not(test), not(target_os="android"))]
+#[cfg(not(test))]
 use std::os;
 #[cfg(not(test), target_os="android")]
 use std::str;
@@ -83,7 +83,7 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
             }
         }
 
-        let mut opts = opts::from_cmdline_args(args.as_slice());
+        let opts = opts::from_cmdline_args(args.as_slice());
         match opts {
             Some(mut o) => {
                 // Always use CPU rendering on android.
diff --git a/src/components/util/memory.rs b/src/components/util/memory.rs
index 7dc98013912..1484b1cfd9f 100644
--- a/src/components/util/memory.rs
+++ b/src/components/util/memory.rs
@@ -156,7 +156,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
     unsafe {
         rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, mut_null(), 0);
     }
-    if rv == 0 { Some(old) } else { None }
+    if rv == 0 { Some(old as u64) } else { None }
 }
 
 // Like std::macros::try!, but for Option<>.
diff --git a/src/support/stringcache/string-cache b/src/support/stringcache/string-cache
index 00caade7269..be58e452719 160000
--- a/src/support/stringcache/string-cache
+++ b/src/support/stringcache/string-cache
@@ -1 +1 @@
-Subproject commit 00caade726945dd8a7bbe81d4f8e77c0177d8ee3
+Subproject commit be58e4527196b58cd2f9b19ddf53c8115af676b5