Use OS_TEST_PATH if already set in env

Change-Id: Idf8c203b7c29e2d9a758773a762ac01fed40d189
Merge "Use OS_TEST_PATH if already set in env"