resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp

Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30

diff --cc core/Makefile
index 02f1741,3535ef7..2377626
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1401,11 -1385,12 +1401,13 @@@ $(INTERNAL_SDK_TARGET): $(deps
                        -I $(TARGET_COMMON_OUT_ROOT) \
                        -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \
                        -v "OUT_DIR=$(OUT_DIR)" \
+                       -v "TARGET_ARCH=$(TARGET_ARCH)" \
+                       -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
                        -o $(PRIVATE_DIR) && \
                cp -f $(target_notice_file_txt) \
-                               $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \
+                               $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/$(TARGET_CPU_ABI)/NOTICE.txt && \
                cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \
 +              cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \
                if [ -f $(PRIVATE_DIR)/platform-tools/llvm-rs-cc ]; then \
                        $(HOST_STRIP_SDK_LLVM) $(PRIVATE_DIR)/platform-tools/llvm-rs-cc; \
                fi && \

diff --cc core/combo/TARGET_linux-x86.mk
Simple merge

diff --cc core/tasks/sdk-addon.mk
Simple merge

diff --cc target/product/full_x86.mk
index 9e22bc5,e33ef14..7602da5
--- 1/target/product/full_x86.mk
--- 2/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@@ -16,18 -16,11 +16,18 @@@
  
  # This is a build configuration for a full-featured build of the
  # Open-Source part of the tree. It's geared toward a US-centric
- # x86 build, but all those aspects can be overridden
- # in inherited configurations.
+ # build quite specifically for the emulator, and might not be
+ # entirely appropriate to inherit from for on-device configurations.
  
 +# If running on an emulator or some other device that has a LAN connection
 +# that isn't a wifi connection. This will instruct init.rc to enable the
 +# network connection so that you can use it with ADB
 +ifdef NET_ETH0_STARTONBOOT
 +  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
 +endif
 +
  $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 -$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
 +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
  
  # Overrides
  PRODUCT_NAME := full_x86