Apply changes to migrate to upstream Oct 20th 2011.

Change-Id: I2bb819151f3fa5ce18690ef373bf071205d3f278
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 9a86718..8432ad9 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,37 +1,34 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_codegen_TBLGEN_TABLES :=	\
-    X86GenAsmWriter.inc \
-    X86GenAsmWriter1.inc \
-    X86GenRegisterInfo.inc	\
-    X86GenInstrInfo.inc	\
-    X86GenDAGISel.inc	\
-    X86GenFastISel.inc	\
-    X86GenSubtargetInfo.inc	\
-    X86GenCallingConv.inc
+x86_codegen_TBLGEN_TABLES := \
+  X86GenAsmWriter.inc \
+  X86GenAsmWriter1.inc \
+  X86GenRegisterInfo.inc \
+  X86GenInstrInfo.inc \
+  X86GenDAGISel.inc \
+  X86GenFastISel.inc \
+  X86GenSubtargetInfo.inc \
+  X86GenCallingConv.inc
 
-x86_codegen_SRC_FILES :=	\
-    SSEDomainFix.cpp	\
-    X86AsmBackend.cpp	\
-    X86AsmPrinter.cpp	\
-    X86COFFMachineModuleInfo.cpp	\
-    X86CodeEmitter.cpp	\
-    X86ELFWriterInfo.cpp	\
-    X86FastISel.cpp	\
-    X86FloatingPoint.cpp\
-    X86FrameLowering.cpp\
-    X86ISelDAGToDAG.cpp	\
-    X86ISelLowering.cpp	\
-    X86InstrInfo.cpp	\
-    X86JITInfo.cpp	\
-    X86MachObjectWriter.cpp \
-    X86MCCodeEmitter.cpp	\
-    X86MCInstLower.cpp	\
-    X86RegisterInfo.cpp	\
-    X86SelectionDAGInfo.cpp	\
-    X86Subtarget.cpp	\
-    X86TargetMachine.cpp	\
-    X86TargetObjectFile.cpp
+x86_codegen_SRC_FILES := \
+  X86AsmPrinter.cpp \
+  X86COFFMachineModuleInfo.cpp \
+  X86CodeEmitter.cpp \
+  X86ELFWriterInfo.cpp \
+  X86FastISel.cpp \
+  X86FloatingPoint.cpp \
+  X86FrameLowering.cpp \
+  X86ISelDAGToDAG.cpp \
+  X86ISelLowering.cpp \
+  X86InstrInfo.cpp \
+  X86JITInfo.cpp \
+  X86MCInstLower.cpp \
+  X86RegisterInfo.cpp \
+  X86SelectionDAGInfo.cpp \
+  X86Subtarget.cpp \
+  X86TargetMachine.cpp \
+  X86TargetObjectFile.cpp \
+  X86VZeroUpper.cpp
 
 # For the host
 # =====================================================