DO NOT MERGE: Cherrypick dependency fixes for espresso from master to oc-mr1-dev

master changes: ag/2573455, ag/2576567

Test: make SettingsGoogleUnitTests; runtest --path
vendor/unbundled_google/packages/SettingsGoogle/tests/unit/src/com/google/android/settings/search/SearchRankingDataTest.java

Change-Id: Ibdc6db412772ab646ac0fecc6b1e2fb9b997b744