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

Change-Id: I1137ed6eb729f0b685856a8ad47e25e22f4194e5