Merge "Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex"