Remove use of junit4-target when used with junit-targetdex am: e20202f9c9
am: 05053b0bd3

Change-Id: I285046055b5c0a68198be449c51ffdcf0c18bca1