Merge "Adjust tests to new android-support-test + espresso libraries."
am: 809062c26d  -s ours

Change-Id: I9691f0221998569194b453619e90a214776ae6ab