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

Change-Id: If523203858a62d8c8002afcf931b92edf1200b5b