Roll base to ec59756cc1ad02cc835bcca10056a621c9eb346c.

build/secondary/third_party/android_tools/BUILD.gn

Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index c674d9a892be926634d076dacb9a5d90d3dd463c..2b806f44b8763f9c2463f9579e543254a72eb8ac 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -29,6 +29,11 @@ android_java_prebuilt("uiautomator_java") {
   jar_path = "$android_sdk/uiautomator.jar"
 }
 
+java_prebuilt("android_support_multidex_java") {
+  supports_android = true
+  jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/android-support-multidex.jar"
+}
+
 android_java_prebuilt("android_support_v13_java") {
   jar_path =
       "$android_sdk_root/extras/android/support/v13/android-support-v13.jar"
@@ -60,8 +65,8 @@ android_resources("android_support_v7_mediarouter_resources") {
 
 android_java_prebuilt("android_support_v7_mediarouter_java") {
   deps = [
-    ":android_support_v7_mediarouter_resources",
     ":android_support_v7_appcompat_java",
+    ":android_support_v7_mediarouter_resources",
   ]
   jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
 }