Merge "Remove emulator modules from sdk PRODUCT_PACKAGES"