Replace junit-targetdex with junit am: 1f7c52f3dd am: 178cf625cc am: 1ff506629c
am: f2be0b5288

Change-Id: I841c2f90abc7560b99c27e8744e19a23ca054c30