Merge "Add junit target as replacement for junit-targetdex"