Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex am: 6f56afc883 am: f76c7659c2
am: 332e82d549

Change-Id: I719e425f5eb1b6af545b39cbefb0042bc37cee14