Merge "emulator: enable adb in SdkSetup"