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

Change-Id: I723c0dc39c3b5ec3300a296cd6ac44e761615249