Avoid JUnit4 collision in android-support-test, mockito-target

Bug: 31072145
Test: make droid checkbuild

Change-Id: I3fa71d30b139461e36bec746fdac8eee048273be
1 file changed