am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."

* commit 'bd36506ee4ece41b8a32ac5b078e4538af4bc02a':
  Switch x86 to uapi headers.

diff --cc core/combo/TARGET_linux-x86.mk
index 795a016,873e0eb..b7a16d6
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -110,13 -110,12 +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 \