Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Update UiAutomator prebuilt with tool type support.

Change-Id: I43246b732c76dcd3bda266f1ce145615ce161692
diff --git a/common/ub-uiautomator/PREBUILT b/common/ub-uiautomator/PREBUILT
index d520948..0279548 100644
--- a/common/ub-uiautomator/PREBUILT
+++ b/common/ub-uiautomator/PREBUILT
@@ -1,6 +1,6 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/frameworks/uiautomator
 
-From the revision 0dcd34389ad7498487acd11a14a3662f9e4cecd3
+From the revision bccbc6fab350e21b1a6ae7ce69ddc48fd9658b4b
 
-Prebuilt jar obtained from uiautomator@1871656
+Prebuilt jar obtained from ub-support-test@2352021
diff --git a/common/ub-uiautomator/ub-uiautomator.jar b/common/ub-uiautomator/ub-uiautomator.jar
index 69c3213..6b6cbd3 100644
--- a/common/ub-uiautomator/ub-uiautomator.jar
+++ b/common/ub-uiautomator/ub-uiautomator.jar
Binary files differ