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

Change-Id: Ie3b2cc4617faf15e477ffa9ac2002b6c99249561