Remove dependency on com.google.android.collect classes

In preparation for building android.legacy.test library against
the SDK this removes a dependency on internal classes.

Bug: 30188076
Test: make checkbuild
Change-Id: I9ea3827ab5db167c8cbddad25f0815c942681092