Apply changes to migrate to upstream Oct 20th 2011.

Change-Id: I2bb819151f3fa5ce18690ef373bf071205d3f278
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 257cbea..4a36e4a 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,73 +1,74 @@
 LOCAL_PATH:= $(call my-dir)
 
-support_SRC_FILES :=   \
-	Allocator.cpp   \
-	APFloat.cpp \
-	APInt.cpp   \
-	APSInt.cpp  \
-	Atomic.cpp  \
-	BranchProbability.cpp \
-	CommandLine.cpp \
-	ConstantRange.cpp   \
-	CrashRecoveryContext.cpp	\
-	DAGDeltaAlgorithm.cpp	\
-	Debug.cpp   \
-	DeltaAlgorithm.cpp  \
-	Dwarf.cpp   \
-	DynamicLibrary.cpp	\
-	Errno.cpp	\
-	ErrorHandling.cpp   \
-	FileUtilities.cpp   \
-	FoldingSet.cpp  \
-	FormattedStream.cpp \
-	GraphWriter.cpp \
-	Host.cpp	\
-	IntervalMap.cpp \
-	IntEqClasses.cpp\
-	IsInf.cpp   \
-	IsNAN.cpp   \
-	ManagedStatic.cpp   \
-	Memory.cpp	\
-	MemoryBuffer.cpp    \
-	MemoryObject.cpp    \
-	Mutex.cpp \
-	Path.cpp \
-	PathV2.cpp \
-	PluginLoader.cpp    \
-	PrettyStackTrace.cpp    \
-	Process.cpp \
-	Program.cpp \
-	Regex.cpp   \
-	RWMutex.cpp \
-	SearchForAddressOfSpecialSymbol.cpp \
-	Signals.cpp \
-	SmallPtrSet.cpp \
-	SmallVector.cpp \
-	SourceMgr.cpp   \
-	Statistic.cpp   \
-	StringExtras.cpp    \
-	StringMap.cpp   \
-	StringPool.cpp  \
-	StringRef.cpp   \
-	SystemUtils.cpp \
-	TargetRegistry.cpp  \
-	Threading.cpp \
-	ThreadLocal.cpp \
-	Timer.cpp   \
-	TimeValue.cpp	\
-	ToolOutputFile.cpp \
-	Triple.cpp  \
-	Twine.cpp   \
-	Valgrind.cpp\
-	circular_raw_ostream.cpp    \
-	raw_os_ostream.cpp  \
-	raw_ostream.cpp \
-	regcomp.c   \
-	regerror.c  \
-	regexec.c   \
-	regfree.c   \
-	regstrlcpy.c \
-	system_error.cpp
+support_SRC_FILES := \
+  Allocator.cpp \
+  APFloat.cpp \
+  APInt.cpp \
+  APSInt.cpp \
+  Atomic.cpp \
+  BlockFrequency.cpp \
+  BranchProbability.cpp \
+  CommandLine.cpp \
+  ConstantRange.cpp \
+  CrashRecoveryContext.cpp \
+  DAGDeltaAlgorithm.cpp \
+  Debug.cpp \
+  DeltaAlgorithm.cpp \
+  Dwarf.cpp \
+  DynamicLibrary.cpp \
+  Errno.cpp \
+  ErrorHandling.cpp \
+  FileUtilities.cpp \
+  FoldingSet.cpp \
+  FormattedStream.cpp \
+  GraphWriter.cpp \
+  Host.cpp \
+  IntervalMap.cpp \
+  IntEqClasses.cpp \
+  IsInf.cpp \
+  IsNAN.cpp \
+  ManagedStatic.cpp \
+  Memory.cpp \
+  MemoryBuffer.cpp \
+  MemoryObject.cpp \
+  Mutex.cpp \
+  Path.cpp \
+  PathV2.cpp \
+  PluginLoader.cpp \
+  PrettyStackTrace.cpp \
+  Process.cpp \
+  Program.cpp \
+  Regex.cpp \
+  RWMutex.cpp \
+  SearchForAddressOfSpecialSymbol.cpp \
+  Signals.cpp \
+  SmallPtrSet.cpp \
+  SmallVector.cpp \
+  SourceMgr.cpp \
+  Statistic.cpp \
+  StringExtras.cpp \
+  StringMap.cpp \
+  StringPool.cpp \
+  StringRef.cpp \
+  SystemUtils.cpp \
+  TargetRegistry.cpp \
+  Threading.cpp \
+  ThreadLocal.cpp \
+  Timer.cpp \
+  TimeValue.cpp \
+  ToolOutputFile.cpp \
+  Triple.cpp \
+  Twine.cpp \
+  Valgrind.cpp \
+  circular_raw_ostream.cpp \
+  raw_os_ostream.cpp \
+  raw_ostream.cpp \
+  regcomp.c \
+  regerror.c \
+  regexec.c \
+  regfree.c \
+  regstrlcpy.c \
+  system_error.cpp
 
 # For the host
 # =====================================================