merge intel x86 patches into gingerbread branch

Android.mk

@@ -36,6 +36,7 @@ LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/stage1
 
 LOCAL_MODULE := grub_stage1
+LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/grub
 
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
@@ -98,6 +99,7 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/stage2
 
 LOCAL_MODULE := grub_pre_stage2
+LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/grub
 
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
@@ -135,6 +137,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES :=
 
 LOCAL_MODULE := grub_start_stage2
+LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/grub
 
 # <generate the header file>