Fix source list of Android.mk.
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 17e4b37..bd0f59c 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -8,6 +8,7 @@
 	AliasSetTracker.cpp	\
 	Analysis.cpp	\
 	BasicAliasAnalysis.cpp	\
+	BranchProbabilityInfo.cpp \
 	CFGPrinter.cpp	\
 	CaptureTracking.cpp	\
 	ConstantFolding.cpp	\
@@ -50,7 +51,7 @@
 	ScalarEvolutionNormalization.cpp    \
 	SparsePropagation.cpp   \
 	Trace.cpp   \
-        TypeBasedAliasAnalysis.cpp \
+	TypeBasedAliasAnalysis.cpp \
 	ValueTracking.cpp
 
 # For the host
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 16e0f88..1cbf6cd 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -2,6 +2,7 @@
 
 codegen_SRC_FILES :=   \
 	AggressiveAntiDepBreaker.cpp    \
+	AllocationOrder.cpp \
 	Analysis.cpp    \
 	BranchFolding.cpp   \
 	CalcSpillWeights.cpp    \
@@ -19,11 +20,13 @@
 	GCStrategy.cpp  \
 	IfConversion.cpp    \
 	InlineSpiller.cpp	\
+	InterferenceCache.cpp \
 	IntrinsicLowering.cpp   \
 	LLVMTargetMachine.cpp   \
 	LatencyPriorityQueue.cpp    \
 	LiveDebugVariables.cpp \
 	LiveInterval.cpp    \
+	LiveIntervalUnion.cpp \
 	LiveIntervalAnalysis.cpp    \
 	LiveRangeEdit.cpp \
 	LiveStackAnalysis.cpp   \
@@ -31,6 +34,7 @@
 	LocalStackSlotAllocation.cpp	\
 	LowerSubregs.cpp    \
 	MachineBasicBlock.cpp   \
+	MachineBranchProbabilityInfo.cpp \
 	MachineCSE.cpp  \
 	MachineDominators.cpp   \
 	MachineFunction.cpp \
@@ -40,6 +44,7 @@
 	MachineInstr.cpp    \
 	MachineLICM.cpp \
 	MachineLoopInfo.cpp \
+	MachineLoopRanges.cpp \
 	MachineModuleInfo.cpp   \
 	MachineModuleInfoImpls.cpp  \
 	MachinePassRegistry.cpp \
@@ -59,10 +64,13 @@
 	ProcessImplicitDefs.cpp \
 	PrologEpilogInserter.cpp    \
 	PseudoSourceValue.cpp   \
+	RegAllocBasic.cpp \
 	RegAllocFast.cpp	\
+	RegAllocGreedy.cpp \
 	RegAllocLinearScan.cpp  \
 	RegAllocPBQP.cpp    \
 	RegisterCoalescer.cpp   \
+	RegisterClassInfo.cpp \
 	RegisterScavenging.cpp  \
 	RenderMachineFunction.cpp	\
 	ScheduleDAG.cpp \
@@ -76,6 +84,7 @@
 	SjLjEHPrepare.cpp   \
 	SlotIndexes.cpp \
 	Spiller.cpp \
+	SpillPlacement.cpp \
 	SplitKit.cpp	\
 	Splitter.cpp	\
 	StackProtector.cpp  \
diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index bc609b3..47cb637 100644
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -14,10 +14,11 @@
 	ARMException.cpp	\
 	DIE.cpp	\
 	DwarfCFIException.cpp \
+	DwarfCompileUnit.cpp \
 	DwarfDebug.cpp	\
 	DwarfException.cpp	\
-	DwarfTableException.cpp \
-	OcamlGCPrinter.cpp
+	OcamlGCPrinter.cpp \
+	Win64Exception.cpp
 
 LOCAL_MODULE:= libLLVMAsmPrinter
 
@@ -32,6 +33,7 @@
 
 LOCAL_SRC_FILES :=	\
 	AsmPrinter.cpp	\
+	AsmPrinterDwarf.cpp	\
 	AsmPrinterInlineAsm.cpp
 
 LOCAL_MODULE:= libLLVMAsmPrinter
diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk
index 3c79f29..7c1cfdd 100644
--- a/lib/ExecutionEngine/JIT/Android.mk
+++ b/lib/ExecutionEngine/JIT/Android.mk
@@ -11,8 +11,7 @@
 	JITDwarfEmitter.cpp	\
 	JITEmitter.cpp	\
 	JITMemoryManager.cpp	\
-	OProfileJITEventListener.cpp	\
-	TargetSelect.cpp
+	OProfileJITEventListener.cpp
 
 LOCAL_MODULE:= libLLVMJIT
 
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 658cdbb..a92df92 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -32,6 +32,7 @@
 	MCStreamer.cpp  \
 	MCSymbol.cpp    \
 	MCValue.cpp \
+	MCWin64EH.cpp \
 	WinCOFFObjectWriter.cpp	\
 	WinCOFFStreamer.cpp	\
 	TargetAsmBackend.cpp
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 7af2025..257cbea 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -6,6 +6,7 @@
 	APInt.cpp   \
 	APSInt.cpp  \
 	Atomic.cpp  \
+	BranchProbability.cpp \
 	CommandLine.cpp \
 	ConstantRange.cpp   \
 	CrashRecoveryContext.cpp	\
@@ -65,7 +66,7 @@
 	regerror.c  \
 	regexec.c   \
 	regfree.c   \
-	regstrlcpy.c\
+	regstrlcpy.c \
 	system_error.cpp
 
 # For the host
diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index e939382..b19ef66 100644
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -21,8 +21,7 @@
 	PartialInlining.cpp	\
 	PruneEH.cpp	\
 	StripDeadPrototypes.cpp	\
-	StripSymbols.cpp	\
-	StructRetPromotion.cpp
+	StripSymbols.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 94f4651..d4ac0da 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -6,6 +6,7 @@
 
 LOCAL_SRC_FILES :=      \
      EdgeProfiling.cpp   \
+     GCOVProfiling.cpp \
      Instrumentation.cpp \
      ProfilingUtils.cpp      \
      PathProfiling.cpp \
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 662c83c..a57d4bd 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -21,6 +21,7 @@
 	LoopUnswitch.cpp    \
 	LowerAtomic.cpp \
 	MemCpyOptimizer.cpp \
+	ObjCARC.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
 	SCCP.cpp    \
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 07a2883..93d36e7 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -7,7 +7,6 @@
 	BreakCriticalEdges.cpp	\
 	BuildLibCalls.cpp	\
 	CloneFunction.cpp	\
-	CloneLoop.cpp	\
 	CloneModule.cpp	\
 	CodeExtractor.cpp	\
 	DemoteRegToStack.cpp	\
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 141ae30..034b59f 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -15,6 +15,7 @@
 	CodeGenDAGPatterns.cpp  \
 	CodeGenInstruction.cpp  \
 	CodeGenTarget.cpp   \
+	CodeGenRegisters.cpp \
 	DAGISelEmitter.cpp  \
 	DAGISelMatcher.cpp  \
 	DAGISelMatcherEmitter.cpp   \
@@ -32,6 +33,7 @@
 	OptParserEmitter.cpp    \
 	Record.cpp  \
 	RegisterInfoEmitter.cpp \
+	SetTheory.cpp \
 	StringMatcher.cpp \
 	SubtargetEmitter.cpp    \
 	TGLexer.cpp \