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

Change-Id: If62000c86048969ca69d60e1cde2495d8e963859