Harmonize sources across core-tests and core-tests-hostdex

Change-Id: I450b13e714cf68310bf53e2fe740e9ecaac44576
1 file changed