Merge "emulator: move SdkSetup to product" am: 7fa0b26829
am: 3f81aa9460

Change-Id: Ibd1da8a9eb4bc0e2138fc687df8fc1faa3d60fdc