Merge "emulator: enable adb in SdkSetup"
am: f1ce89247e

Change-Id: I3bfeb9c354d29b77437ac2f5c3fa206921e3268c