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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I257899fe815855d8cb9763693063b559d5038fb8
1 file changed