diff --git a/README.android b/README.android
index 32a4ecc..6801de1 100644
--- a/README.android
+++ b/README.android
@@ -20,7 +20,10 @@
 * For Ice Cream Sandwich MR2: Synced to upstream r146715
 * For Jellybean: Synced to upstream r155088
 * For Jellybean MR1: Synced to upstream r162325.
+* For Jellybean MR2: Synced to upstream r176138
 
+* Recent downstreaming on 2013/3/5: Synced to r176138 (Contact srhines for merge questions.)
+* Recent downstreaming on 2013/1/8: Synced to r171906 (Contact srhines for merge questions.)
 * Recent downstreaming on 2012/8/23: Synced to r162325 (srhines for merge questions)
 * Recent downstreaming on 2012/8/3: Synced to r160673 (sliao for merge questions)
 * Recent downstreaming on 2012/4/24: Synced to r155088 (sliao for merge questions)
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index a680fc7..82d079b 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -37,6 +37,13 @@
 	$(call transform-host-clang-td-to-out,clang-attr-spelling-list)
 endif
 
+ifneq ($(findstring AttrSpellingListIndex.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Sema/AttrSpellingListIndex.inc
+$(intermediates)/include/clang/Sema/AttrSpellingListIndex.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/Sema/AttrSpellingListIndex.inc: $(CLANG_ROOT_PATH)/include/clang/Basic/Attr.td | $(CLANG_TBLGEN)
+	$(call transform-host-clang-td-to-out,clang-attr-spelling-index)
+endif
+
 ifneq ($(findstring AttrPCHRead.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Serialization/AttrPCHRead.inc
 $(intermediates)/include/clang/Serialization/AttrPCHRead.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
@@ -105,6 +112,24 @@
 	$(call transform-host-clang-td-to-out,clang-comment-command-info)
 endif
 
+ifneq ($(findstring CommentCommandList.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentCommandList.inc
+$(intermediates)/include/clang/AST/CommentCommandList.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/CommentCommandList.inc: \
+  $(CLANG_ROOT_PATH)/include/clang/AST/CommentCommands.td \
+  | $(CLANG_TBLGEN)
+	$(call transform-host-clang-td-to-out,clang-comment-command-list)
+endif
+
+ifneq ($(findstring CommentHTMLNamedCharacterReferences.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentHTMLNamedCharacterReferences.inc
+$(intermediates)/include/clang/AST/CommentHTMLNamedCharacterReferences.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/CommentHTMLNamedCharacterReferences.inc: \
+  $(CLANG_ROOT_PATH)/include/clang/AST/CommentHTMLNamedCharacterReferences.td \
+  | $(CLANG_TBLGEN)
+	$(call transform-host-clang-td-to-out,clang-comment-html-named-character-references)
+endif
+
 ifneq ($(findstring CommentHTMLTagsProperties.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentHTMLTagsProperties.inc
 $(intermediates)/include/clang/AST/CommentHTMLTagsProperties.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
diff --git a/lib/ARCMigrate/Android.mk b/lib/ARCMigrate/Android.mk
index c79b963..5ee7191 100644
--- a/lib/ARCMigrate/Android.mk
+++ b/lib/ARCMigrate/Android.mk
@@ -9,6 +9,7 @@
   Attrs.inc \
   AttrList.inc \
   AttrParsedAttrList.inc    \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/AST/Android.mk b/lib/AST/Android.mk
index 9c7bfb3..bd719c8 100644
--- a/lib/AST/Android.mk
+++ b/lib/AST/Android.mk
@@ -11,6 +11,8 @@
 	AttrList.inc	\
 	Attrs.inc	\
 	CommentCommandInfo.inc \
+	CommentCommandList.inc \
+	CommentHTMLNamedCharacterReferences.inc \
 	CommentHTMLTags.inc \
 	CommentHTMLTagsProperties.inc \
 	CommentNodes.inc \
@@ -32,7 +34,6 @@
 	Comment.cpp \
 	CommentBriefParser.cpp \
 	CommentCommandTraits.cpp \
-	CommentDumper.cpp \
 	CommentLexer.cpp \
 	CommentParser.cpp \
 	CommentSema.cpp \
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 8af3726..7d2d1f9 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -8,6 +8,7 @@
 TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/Basic/Android.mk b/lib/Basic/Android.mk
index 671a0c2..b8d8a11 100644
--- a/lib/Basic/Android.mk
+++ b/lib/Basic/Android.mk
@@ -22,8 +22,7 @@
 
 clang_basic_SRC_FILES := \
   Builtins.cpp \
-  ConvertUTF.c \
-  ConvertUTFWrapper.cpp \
+  CharInfo.cpp \
   Diagnostic.cpp \
   DiagnosticIDs.cpp \
   FileManager.cpp \
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 57cba76..abce5e7 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -3,6 +3,7 @@
 clang_codegen_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/Edit/Android.mk b/lib/Edit/Android.mk
index 765fdb5..87f4e25 100644
--- a/lib/Edit/Android.mk
+++ b/lib/Edit/Android.mk
@@ -14,6 +14,7 @@
 TBLGEN_TABLES := \
   Attrs.inc \
   AttrList.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/Frontend/Android.mk b/lib/Frontend/Android.mk
index c5ce90e..0839dec 100644
--- a/lib/Frontend/Android.mk
+++ b/lib/Frontend/Android.mk
@@ -10,6 +10,7 @@
   Attrs.inc \
   AttrParsedAttrList.inc \
   CC1Options.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DiagnosticASTKinds.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/Parse/Android.mk b/lib/Parse/Android.mk
index 00073f1..0bd3c20 100644
--- a/lib/Parse/Android.mk
+++ b/lib/Parse/Android.mk
@@ -10,6 +10,7 @@
 	AttrLateParsed.inc  \
 	AttrParsedAttrList.inc  \
 	Attrs.inc  \
+	CommentCommandList.inc \
 	CommentNodes.inc \
 	DeclNodes.inc  \
 	DiagnosticParseKinds.inc  \
diff --git a/lib/Rewrite/Frontend/Android.mk b/lib/Rewrite/Frontend/Android.mk
index 8d15425..2bbf311 100644
--- a/lib/Rewrite/Frontend/Android.mk
+++ b/lib/Rewrite/Frontend/Android.mk
@@ -13,6 +13,7 @@
   AttrList.inc \
   Attrs.inc \
   AttrParsedAttrList.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index ed7246d..457921f 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -10,7 +10,9 @@
 	Attrs.inc	\
 	AttrParsedAttrKinds.inc    \
 	AttrParsedAttrList.inc    \
+	AttrSpellingListIndex.inc \
 	AttrTemplateInstantiate.inc	\
+	CommentCommandList.inc \
 	CommentNodes.inc \
 	DeclNodes.inc	\
 	DiagnosticASTKinds.inc	\
diff --git a/lib/Serialization/Android.mk b/lib/Serialization/Android.mk
index 01656d9..751e306 100644
--- a/lib/Serialization/Android.mk
+++ b/lib/Serialization/Android.mk
@@ -15,6 +15,7 @@
   AttrPCHRead.inc \
   AttrPCHWrite.inc \
   Attrs.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
@@ -24,7 +25,6 @@
   StmtNodes.inc
 
 clang_serialization_SRC_FILES :=\
-  GeneratePCH.cpp \
   ASTCommon.cpp \
   ASTReader.cpp \
   ASTReaderDecl.cpp \
@@ -32,6 +32,8 @@
   ASTWriter.cpp \
   ASTWriterDecl.cpp \
   ASTWriterStmt.cpp \
+  GeneratePCH.cpp \
+  GlobalModuleIndex.cpp \
   Module.cpp \
   ModuleManager.cpp
 
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index 1821920..24e2cf2 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -6,6 +6,7 @@
   AttrParsedAttrList.inc \
   Attrs.inc \
   Checkers.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/StaticAnalyzer/Core/Android.mk b/lib/StaticAnalyzer/Core/Android.mk
index 57bfb0b..324cbc9 100644
--- a/lib/StaticAnalyzer/Core/Android.mk
+++ b/lib/StaticAnalyzer/Core/Android.mk
@@ -3,6 +3,7 @@
 clang_static_analyzer_core_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/lib/StaticAnalyzer/Frontend/Android.mk b/lib/StaticAnalyzer/Frontend/Android.mk
index e7c6664..031c330 100644
--- a/lib/StaticAnalyzer/Frontend/Android.mk
+++ b/lib/StaticAnalyzer/Frontend/Android.mk
@@ -6,6 +6,7 @@
 clang_static_analyzer_frontend_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentCommandList.inc \
   CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk
index 919db0e..e78273b 100644
--- a/tools/driver/Android.mk
+++ b/tools/driver/Android.mk
@@ -75,6 +75,7 @@
   libLLVMMC \
   libLLVMMCParser \
   libLLVMScalarOpts \
+  libLLVMTransformObjCARC \
   libLLVMTransformUtils \
   libLLVMVectorize \
   libLLVMAnalysis \
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 3d2ce0e..ae76bd1 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -4,6 +4,7 @@
   ClangASTNodesEmitter.cpp \
   ClangAttrEmitter.cpp \
   ClangCommentCommandInfoEmitter.cpp \
+  ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
   ClangCommentHTMLTagsEmitter.cpp \
   ClangDiagnosticsEmitter.cpp \
   ClangSACheckersEmitter.cpp \