Adding auto-detect for android and locator tester