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

Bug: 30875057
Change-Id: Ib48f3d5aca127474ca5bd3ba1b91eeae33ddbef7
23 files changed