Merge up through LLVM r163557.

Updated Android.mk source files for Analysis, CodeGen, Target/Mips,
Transforms/Instrumentation, and Transforms/Utils.

Change-Id: I232a895e3ad9ec0c4a66f4308a11bb794b67940f
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 19c58f3..2ebf091 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -41,6 +41,8 @@
   PathProfileInfo.cpp \
   PathProfileVerifier.cpp \
   PostDominators.cpp \
+  ProfileDataLoader.cpp \
+  ProfileDataLoaderPass.cpp \
   ProfileEstimatorPass.cpp \
   ProfileInfo.cpp \
   ProfileInfoLoader.cpp \