Fix *tests-run-on-host target

Change-Id: Id0e5060977a2df91c47b5a916989eb7e2e3f8153
Merge "Fix *tests-run-on-host target"