diff --git a/envsetup.sh b/envsetup.sh
index 8a995c7fd..abea43680 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -210,6 +210,7 @@ function setpaths()
     # defined in core/config.mk
     local targetgccversion=$(get_build_var TARGET_GCC_VERSION)
     local targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)
+    export DISABLE_ARTIFACT_PATH_REQUIREMENTS="true"
     export TARGET_GCC_VERSION=$targetgccversion
 
     # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
diff --git a/target/board/emulator_x86_64/BoardConfig.mk b/target/board/emulator_x86_64/BoardConfig.mk
index b9cbd8a24..e2b164dac 100755
--- a/target/board/emulator_x86_64/BoardConfig.mk
+++ b/target/board/emulator_x86_64/BoardConfig.mk
@@ -40,3 +40,7 @@ WPA_SUPPLICANT_VERSION      := VER_0_8_X
 WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"
 WIFI_DRIVER_FW_PATH_STA     := "/dev/null"
 WIFI_DRIVER_FW_PATH_AP      := "/dev/null"
+
+BUILD_BROKEN_DUP_RULES := true
+ALLOW_MISSING_DEPENDENCIES := true
+BUILD_BROKEN_USES_NETWORK := true
diff --git a/target/board/emulator_x86_64/device.mk b/target/board/emulator_x86_64/device.mk
index 8a9d8da92..9bd7a77c4 100755
--- a/target/board/emulator_x86_64/device.mk
+++ b/target/board/emulator_x86_64/device.mk
@@ -25,3 +25,9 @@ endif
 PRODUCT_HOST_PACKAGES += \
 	bios.bin \
 	vgabios-cirrus.bin \
+
+PRODUCT_PACKAGES += \
+    libaosk_native \
+    libgnw_aosk \
+    libinstall_native
+
diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk
index 0e1bca4cf..ba8db2bde 100644
--- a/target/product/sdk_phone_x86.mk
+++ b/target/product/sdk_phone_x86.mk
@@ -48,6 +48,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 $(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86/device.mk)
+$(call inherit-product-if-exists, gonk-misc/b2g.mk)
+$(call inherit-product-if-exists, external/moztt/fonts.mk)
 
 # Define the host tools and libs that are parts of the SDK.
 $(call inherit-product-if-exists, sdk/build/product_sdk.mk)
diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk
index fffac047e..4ca212bd7 100644
--- a/target/product/sdk_phone_x86_64.mk
+++ b/target/product/sdk_phone_x86_64.mk
@@ -49,6 +49,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 $(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk)
+$(call inherit-product-if-exists, gonk-misc/b2g.mk)
+$(call inherit-product-if-exists, external/moztt/fonts.mk)
 
 # Define the host tools and libs that are parts of the SDK.
 $(call inherit-product-if-exists, sdk/build/product_sdk.mk)
@@ -63,3 +65,6 @@ PRODUCT_MODEL := Android SDK built for x86_64
 # RadioConfigLib), which makes it impossible to translate their module names to
 # library name, so the check fails.
 PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
+
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.sys.root_access=3