resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp

Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd

core/64_bit_blacklist.mk

@@ -14,7 +14,6 @@ _64_bit_directory_blacklist += \
 	external/chromium-libpac \
 	external/chromium_org \
 	external/skia \
-	external/v8 \
 	frameworks/webview \
 
 # misc build errors
@@ -28,13 +27,14 @@ _64_bit_directory_blacklist += \
 	frameworks/ml \
 	frameworks/opt \
 	frameworks/wilhelm \
+	frameworks/native/cmds/idmap \
 	device/generic/goldfish/opengl \
 	device/generic/goldfish/camera \
 
 # depends on libnl_2
 _64_bit_directory_blacklist += \
 	external/android-clat \
-	external/wpa_suplicant_8
+	external/wpa_supplicant_8 \
 
 # depends on frameworks/av
 _64_bit_directory_blacklist += \

core/executable.mk

@@ -10,7 +10,6 @@ endif
 endif
 
 LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
-
 # check if primary arch is supported
 include $(BUILD_SYSTEM)/module_arch_supported.mk
 ifeq ($(my_module_arch_supported),true)

target/product/embedded.mk

@@ -23,6 +23,7 @@ PRODUCT_PACKAGES += \
     atrace \
     bootanimation \
     debuggerd \
+    debuggerd64 \
     dumpstate \
     dumpsys \
     gralloc.default \
@@ -59,6 +60,7 @@ PRODUCT_PACKAGES += \
     libui \
     libutils \
     linker \
+    linker64 \
     lmkd \
     logcat \
     logwrapper \