Merge "Allow testrunner to run test when inside ART directory"
am: 671eb7beee

Change-Id: I2bf087c4ea2f2b1d02840e0cb1b7d302ba9ffdf8