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

Change-Id: I8d7b813823927e7881f4edac62fa5a3c1371d7a0