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

Change-Id: I4e540a2ff318ae81d1fdb9de1a15478352f3ada7