Kill the remaining usage of com.google.android APIs.
Merge pull request #1438 from robolectric/jw/death-to-collect

Kill the remaining usage of com.google.android APIs.