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

Change-Id: I72642dfea9d98d3023fc0e334767116e33bc6e4d