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

Change-Id: I7e92f0e3c8476dde02f530414223d1736fdc498d