Convert tests to use android-support-test.

Change-Id: Ia1525904c8bd669305f72c6c1973cc0365ca1251
2 files changed