Merge "Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev"" am: a4fd30c653  -s ours am: 060475ef91
am: af4636228d

Change-Id: I525e2eec7322b11c96f01e13c2575772e2efe93d