diff --git a/DEPS b/DEPS
index df649de1cd601..482e891177a86 100644
--- a/DEPS
+++ b/DEPS
@@ -117,7 +117,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8e538639660413490ea9261eee84864005e240f4',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5f54a3e98dea0a79589820527658b49fef7916ea',
 
    # Fuchsia compatibility
    #
diff --git a/ci/docker/build/Dockerfile b/ci/docker/build/Dockerfile
index 7529ba37d5c7a..bf1a470f0e4aa 100644
--- a/ci/docker/build/Dockerfile
+++ b/ci/docker/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 ENV DEPOT_TOOLS_PATH $HOME/depot_tools
 ENV ENGINE_PATH $HOME/engine
diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index 73e2bac819af3..493353be20551 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -146,16 +146,16 @@ java_library("flutter_shell_java") {
   ]
 
   deps = [
-    ":android_support_v4",
+    ":android_support_v13",
   ]
 
   jar_path = "$root_out_dir/flutter_java.jar"
 }
 
-java_prebuilt("android_support_v4") {
+java_prebuilt("android_support_v13") {
   supports_android = true
 
-  jar_path = "//third_party/android_tools/sdk/extras/android/support/v4/android-support-v4.jar"
+  jar_path = "//third_party/android_tools/sdk/extras/android/support/v13/android-support-v13.jar"
 }
 
 copy("flutter_shell_assets") {