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