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

Change-Id: I8f07ee440b02a6715ccf3e2867c8ceb31f532260