servo: Merge #5976 - Osx android fixes (from larsbergstrom:osx-android-fixes); r=glennw

r? @metajack

Thanks to @alexcrichton for all the work to figure out our problems here!

Source-Repo: https://github.com/servo/servo
Source-Revision: 02cf89f4d3fb991a27ecbaf8d3cafe5722750cc6

servo/components/servo/.cargo/config

@@ -2,3 +2,4 @@ paths = ["../../support/android-rs-glue"]
 
 [target.arm-linux-androideabi]
 linker = "../../support/android-rs-glue/apk-builder/target/debug/apk-builder"
+ar = "arm-linux-androideabi-ar"

servo/components/servo/Cargo.lock

@@ -931,7 +931,7 @@ dependencies = [
 [[package]]
 name = "png"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 dependencies = [
  "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -941,7 +941,7 @@ dependencies = [
 [[package]]
 name = "png-sys"
 version = "1.6.16"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 
 [[package]]
 name = "profile"
@@ -1166,7 +1166,7 @@ dependencies = [
 [[package]]
 name = "tenacious"
 version = "0.0.1"
-source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e"
+source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
 
 [[package]]
 name = "time"

servo/ports/cef/Cargo.lock

@@ -920,7 +920,7 @@ dependencies = [
 [[package]]
 name = "png"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 dependencies = [
  "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -930,7 +930,7 @@ dependencies = [
 [[package]]
 name = "png-sys"
 version = "1.6.16"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 
 [[package]]
 name = "profile"
@@ -1158,7 +1158,7 @@ dependencies = [
 [[package]]
 name = "tenacious"
 version = "0.0.1"
-source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e"
+source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
 
 [[package]]
 name = "time"

servo/ports/gonk/Cargo.lock

@@ -792,7 +792,7 @@ dependencies = [
 [[package]]
 name = "png"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 dependencies = [
  "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -802,7 +802,7 @@ dependencies = [
 [[package]]
 name = "png-sys"
 version = "1.6.16"
-source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9"
+source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
 
 [[package]]
 name = "profile"
@@ -1029,7 +1029,7 @@ dependencies = [
 [[package]]
 name = "tenacious"
 version = "0.0.1"
-source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e"
+source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
 
 [[package]]
 name = "time"