Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5bee" am: 19bb72bb04
am: b98d4f052a  -s ours

Change-Id: If4c4f3fd932c9020d53f5f49252f3e852001575d