Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD

Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005

diff --cc core/base_rules.mk
Simple merge

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

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

diff --cc core/combo/TARGET_linux-x86.mk
index 873e0eb,dfd463f..b7a16d6
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -110,12 -110,13 +110,14 @@@ ifneq ($(CUSTOM_KERNEL_HEADERS),
      KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
      KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)
  else
 -    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common
 -    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/arch-$(TARGET_ARCH)
 +    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
 +    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
 +    KERNEL_HEADERS_AUX    := $(libc_root)/kernel/common
  endif
 -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
 +KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX)
  
+ android_config_h := $(call select-android-config-h,target_linux-x86)
+ 
  TARGET_GLOBAL_CFLAGS += \
                        -O2 \
                        -Ulinux \
@@@ -133,13 -134,19 +135,11 @@@
                        -funswitch-loops \
                        -funwind-tables \
                        -fstack-protector \
-                       -m32
- 
- android_config_h := $(call select-android-config-h,target_linux-x86)
- TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
- TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
+                       -m32 \
+                       -include $(android_config_h) \
+                       -I $(dir $(android_config_h))
  
 -# XXX: Not sure this is still needed. Must check with our toolchains.
 -TARGET_GLOBAL_CPPFLAGS += \
 -                      -fno-use-cxa-atexit
 -
  TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)
 -TARGET_GLOBAL_CFLAGS += -mmmx
 -TARGET_GLOBAL_CFLAGS += -msse
 -TARGET_GLOBAL_CFLAGS += -DUSE_SSE2 -msse2
 -TARGET_GLOBAL_CFLAGS += -msse3
  
  ifeq ($(ARCH_X86_HAVE_SSSE3),true)   # yes, really SSSE3, not SSE3!
      TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3

diff --cc core/config.mk
Simple merge

diff --cc core/main.mk
Simple merge

diff --cc target/board/generic/BoardConfig.mk
Simple merge

diff --cc target/product/embedded.mk
index d2344b0,11e02ae..ac5bac3
--- 1/target/product/embedded.mk
--- 2/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@@ -58,10 -61,9 +61,11 @@@ PRODUCT_PACKAGES += 
      linker \
      logcat \
      logwrapper \
 +    mkshrc \
+     reboot \
      service \
      servicemanager \
 +    sh \
      surfaceflinger \
      toolbox