Merge "Make testrunner runnable from art directory"
am: d6f62a538f

Change-Id: Ic6770fe42c47f66e89ba0ac7c0e902ac9c91c8e6