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

Change-Id: Ibda78af76e59021bff61f06ca331c454e9454b3c