Merge "Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev"" am: a4fd30c6 -s ours am: 060475ef Change-Id: Ib99d4a87838e8b1ec3e5fe48a56a4cddabd70083