diff --git a/DEPS b/DEPS
index e083b783e2..0d7fc3f1af 100644
--- a/DEPS
+++ b/DEPS
@@ -184,12 +184,6 @@ hooks = [
     'pattern': '.',
     'action': ['python', 'src/tools/dart/update.py'],
   },
-  {
-    # This downloads android_tools according to tools/android/VERSION_*.
-    'name': 'android_tools',
-    'pattern': '.',
-    'action': ['python', 'src/tools/android/download_android_tools.py'],
-  },
   {
     # This downloads SDK extras and puts them in the
     # third_party/android_tools/sdk/extras directory on the bots. Developers
diff --git a/engine/src/flutter/.travis.yml b/engine/src/flutter/.travis.yml
index 349c9514d2..9bd2f98f5e 100644
--- a/engine/src/flutter/.travis.yml
+++ b/engine/src/flutter/.travis.yml
@@ -6,4 +6,5 @@ before_script:
   - ./travis/setup.sh
   - export PATH=$PWD/depot_tools:$PATH
   - export BOTO_CONFIG=$PWD/boto
+  - cd src
 script: ./travis/build.sh
diff --git a/engine/src/flutter/CONTRIBUTING.md b/engine/src/flutter/CONTRIBUTING.md
index a324f33c07..7fbd99ceed 100644
--- a/engine/src/flutter/CONTRIBUTING.md
+++ b/engine/src/flutter/CONTRIBUTING.md
@@ -39,6 +39,7 @@ target.
 ### Android
 
 * (Only the first time) `./build/install-build-deps-android.sh`
+* (Only the first time) `./tools/android/download_android_tools.py`
 * `./sky/tools/gn --android`
 * `ninja -C out/android_Debug`
 * `./sky/tools/shelldb start out/android_Debug/ sky/sdk/example/hello_world/lib/main.dart`
diff --git a/engine/src/flutter/build/config/crypto.gni b/engine/src/flutter/build/config/crypto.gni
index 90a45eafee..2cd72d338c 100644
--- a/engine/src/flutter/build/config/crypto.gni
+++ b/engine/src/flutter/build/config/crypto.gni
@@ -26,4 +26,4 @@ use_openssl_certs = is_android
 # True if NSS is used for certificate verification. Note that this is
 # independent from use_openssl. It is possible to use OpenSSL for the crypto
 # library, but NSS for the platform certificate library.
-use_nss_certs = is_linux
+use_nss_certs = false
diff --git a/engine/src/flutter/sky/tools/roll/roll.py b/engine/src/flutter/sky/tools/roll/roll.py
index d974c49f9c..e1bab7925a 100755
--- a/engine/src/flutter/sky/tools/roll/roll.py
+++ b/engine/src/flutter/sky/tools/roll/roll.py
@@ -93,6 +93,7 @@ dirs_from_mojo = [
 # The contents of these files before the roll will be preserved after the roll,
 # even though they live in directories rolled in from Chromium.
 files_not_to_roll = [
+    'build/config/crypto.gni',
     'build/config/ui.gni',
     'build/ls.py',
     'build/module_args/mojo.gni',
@@ -145,7 +146,7 @@ def main():
 
   if args.chromium_dir:
       rev(args.chromium_dir, args.dest_dir, dirs_from_chromium, 'chromium')
-    
+
       try:
           patch.patch_and_filter(args.dest_dir)
       except subprocess.CalledProcessError: