am e857d898: am 6697426a: am c50afe92: merge intel x86 patches into gingerbread branch

* commit 'e857d8986fb13cd05e30c9c58939580282131b10':
  Add missing LOCAL_MODULE_TAGS defns.
diff --git a/Android.mk b/Android.mk
index 0abe2e1..50034ba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_SIMULATOR),true)
 ifeq ($(TARGET_ARCH),x86)
 
 include $(CLEAR_VARS)
@@ -192,4 +191,3 @@
 #ALL_PREBUILT += $(grub_full)
 
 endif # x86
-endif # ! sim