Merge "Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex" am: 50c1bb94 am: 174fbeec am: e9bdc9fc Change-Id: I2298fb4c0d739206dc71d6acf7dd2d1cf5bdb1f1