Merge "Revert "Merge "Update android-support-test prebuilts." into oreo-cts-dev""