Merge "Revert "Run test_adb and test_device on emulator buildbot""