Adjust tests to new android-support-test + espresso libraries.

Test: make tests

Change-Id: I7a41199cd7f0739f660a49b1af32e64f58590301
4 files changed