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