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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I507b476694f88cc960804904feff330e6f9358c4
1 file changed