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

Change-Id: Ic601d7882c6a504077e0a4f0cb613cc97c6c4965