Replace junit-targetdex with junit
am: 1f7c52f3dd

Change-Id: Ie10f04fbf66a9c1963e733f5c1d2ef10917a41bf