diff --git a/README.android b/README.android
index 6801de1..715c456 100644
--- a/README.android
+++ b/README.android
@@ -20,8 +20,9 @@
 * 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
+* For Jellybean MR2: Synced to upstream r177345
 
+* Recent downstreaming on 2013/3/18: Synced to r177345 (Contact srhines for merge questions.)
 * 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)
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index abce5e7..dc11b8b 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -13,6 +13,7 @@
 
 clang_codegen_SRC_FILES := \
   BackendUtil.cpp \
+  CGAtomic.cpp \
   CGBlocks.cpp \
   CGBuiltin.cpp \
   CGCUDANV.cpp \
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index 24e2cf2..343dfe3 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -16,7 +16,6 @@
   AnalyzerStatsChecker.cpp \
   ArrayBoundChecker.cpp \
   ArrayBoundCheckerV2.cpp \
-  AttrNonNullChecker.cpp \
   BasicObjCFoundationChecks.cpp \
   BoolAssignmentChecker.cpp \
   BuiltinFunctionChecker.cpp \
@@ -36,12 +35,14 @@
   DeadStoresChecker.cpp \
   DebugCheckers.cpp \
   DereferenceChecker.cpp \
+  DirectIvarAssignment.cpp \
   DivZeroChecker.cpp \
   DynamicTypePropagation.cpp \
   ExprInspectionChecker.cpp \
   FixedAddressChecker.cpp \
   GenericTaintChecker.cpp \
   IdempotentOperationChecker.cpp \
+  IvarInvalidationChecker.cpp \
   LLVMConventionsChecker.cpp \
   MacOSKeychainAPIChecker.cpp \
   MacOSXAPIChecker.cpp \
@@ -51,9 +52,11 @@
   NSAutoreleasePoolChecker.cpp \
   NSErrorChecker.cpp \
   NoReturnFunctionChecker.cpp \
+  NonNullParamChecker.cpp \
   ObjCAtSyncChecker.cpp \
   ObjCContainersASTChecker.cpp \
   ObjCContainersChecker.cpp \
+  ObjCMissingSuperCallChecker.cpp \
   ObjCSelfInitChecker.cpp \
   ObjCUnusedIVarsChecker.cpp \
   PointerArithChecker.cpp \
@@ -62,6 +65,7 @@
   RetainCountChecker.cpp \
   ReturnPointerRangeChecker.cpp \
   ReturnUndefChecker.cpp \
+  SimpleStreamChecker.cpp \
   StackAddrEscapeChecker.cpp \
   StreamChecker.cpp \
   TaintTesterChecker.cpp \