Merge "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5bee" am: 2fc8ea9897  -s ours am: 4dfbafac60
am: b8449ca30f

Change-Id: Ia3df90ff7b98ce2342708d6e3f71f65eff578fd3