diff --git a/.travis.yml b/.travis.yml
index da882aea61b9d2f871cc6868b7bf3a046f3279a6..52d2403cd596375ca2f2a6e47ac0d81dda21bb5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,8 +89,9 @@ matrix:
         - shellcheck ci/*.sh
 
   allow_failures:
-    - env: TARGET=aarch64-linux-android
-    - env: TARGET=x86_64-linux-android
+      # FIXME: https://github.com/rust-lang/libc/issues/1226
+      - env: TARGET=asmjs-unknown-emscripten
+      - env: TARGET=wasm32-unknown-emscripten
 
 install: rustup target add $TARGET
 script:
diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh
index c0f63c9baa0f82fbe1f5cf1b8a4067138a997dae..6b5ac09ab04afe003f8aaa6f43a0fc90deeb5c62 100644
--- a/ci/android-install-sdk.sh
+++ b/ci/android-install-sdk.sh
@@ -46,9 +46,9 @@ case "$1" in
 esac;
 
 # --no_https avoids
-# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
-echo "yes" | \
-    ./sdk/tools/bin/sdkmanager --no_https \
+     # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
+yes | ./sdk/tools/bin/sdkmanager --licenses --no_https
+yes | ./sdk/tools/bin/sdkmanager --no_https \
         "emulator" \
         "platform-tools" \
         "platforms;android-24" \
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 7606800afb9cd56b70d8d0f672cc3e0558255677..5edbdf5b73893ece5b73435cd0f749b194ac3972 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -658,7 +658,7 @@ fn main() {
             // MFD_HUGETLB is not available in some older libc versions on the CI builders. On the
             // x86_64 and i686 builders it seems to be available for all targets, so at least test
             // it there.
-            "MFD_HUGETLB" if !(x86_64 || i686) || musl => true,
+            "MFD_HUGETLB" if !(x86_64 || i686) || musl || (x86_64 && android)=> true,
 
             "DT_FIFO" | "DT_CHR" | "DT_DIR" | "DT_BLK" | "DT_REG"
             | "DT_LNK" | "DT_SOCK"