Replace junit-targetdex with junit am: 8ea811b59b
am: c191dc53ab

Change-Id: Ic0758ad96db59eb017b35e06908b3d04b0323886