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

Change-Id: I3b82ff583e4c5c7a32f678bf1cd4fe6d9cd2557b