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