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

Bug: 31072145
Test: make droid checkbuild

Change-Id: Id3c0c66de8d82418f7ae2ac4b72607956f56f0c3
1 file changed