Merge "testrunner/env.py - Run from any directory" am: 7f734d414a
am: 892273ad3b

Change-Id: I68c1402fdeb08176e3f33eeb6598e5784306cbbb