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

Change-Id: I24271c611e80cad0cc06ddf3c0be67767d5d519b