Replace junit-targetdex with junit
am: 8ea811b59b

Change-Id: I6e5618b94d49ce44df745a0ac369a91cbfd17f48