Merge "Update android-support-test prebuilts."
am: 7ce8e8df8d  -s ours

Change-Id: Ia7ba051e93b4015380830fa181dd9fc7c7e623c9