Merge with upstream LLVM @152063

Removed call to getsid() from LockFileManager.cpp, since bionic doesn't have
support for it.

Build updates
+TableGenAction.cpp
+X86ModRMFilters.cpp
-InstrEnumEmitter.cpp
-JITDebugRegisterer.cpp
-MCLoggingStreamer.cpp
+Hashing.cpp
-ElfCodeEmitter.cpp
-ElfWriter.cpp
-ObjectCodeEmitter.cpp
+DataStream.cpp
+StreamableMemoryObject.cpp
+CmpInstAnalysis.cpp
+LockFileManager.cpp
+IntrusiveRefCntPtr.cpp
+ThreadSanitizer.cpp
+ARMMachineFunctionInfo.cpp
+ARMELFObjectWriter.cpp
+MipsAnalyzeImmediate.cpp
+MipsMachineFunction.cpp
+X86MachineFunctionInfo.cpp
+X86ELFObjectWriter.cpp
+X86WinCOFFObjectWriter.cpp
+ResourcePriorityQueue.cpp
+ScheduleDAGVLIW.cpp
+MachineCopyPropagation.cpp
+MachineScheduler.cpp
+RegAllocBase.cpp
+libLLVMVectorize

Change-Id: I69e700fe357e275ec509af1daaa7408cd3cde3a1
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 8432ad9..445dd5d 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -22,6 +22,7 @@
   X86ISelLowering.cpp \
   X86InstrInfo.cpp \
   X86JITInfo.cpp \
+  X86MachineFunctionInfo.cpp \
   X86MCInstLower.cpp \
   X86RegisterInfo.cpp \
   X86SelectionDAGInfo.cpp \