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

Bug: 31072145
Test: make droid checkbuild

Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2
5 files changed