Merge pull request #631 from grote/aosp_atd

Try aosp_atd emulator for instrumentation tests