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

Change-Id: I637e11b3354bbc30bfff61d5a4976526a1db0fca