Merge "Update android-support-test prebuilts." into oreo-cts-dev am: 8d1bba5bee am: 248693fe30
am: 318c95c92b  -s ours

Change-Id: Ie4af68f5f326f86d44635a23a70f75b3bd05592c