diff --git a/README.android b/README.android
index c6199c1..3e2a226 100644
--- a/README.android
+++ b/README.android
@@ -14,7 +14,10 @@
 
 * For JellyBean: Synced to upstream r155350
 * For JellyBean MR1: Synced to upstream r162279
+* For Jellybean MR2: Synced to upstream r176091
 
+* Recent downstreaming on 2013/3/5: Synced to r176091 (Contact srhines for merge questions.)
+* Recent downstreaming on 2013/1/8: Synced to r171802 (Contact srhines for merge questions.)
 * Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.)
 * Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.)
 * Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.)
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index 56318ba..c743a2c 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -52,6 +52,7 @@
 	../sanitizer_common/sanitizer_linux.cc \
 	../sanitizer_common/sanitizer_mac.cc \
 	../sanitizer_common/sanitizer_posix.cc \
+	../sanitizer_common/sanitizer_platform_limits_posix.cc \
 	../sanitizer_common/sanitizer_printf.cc \
 	../sanitizer_common/sanitizer_stackdepot.cc \
 	../sanitizer_common/sanitizer_stacktrace.cc \
@@ -100,7 +101,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := bionic external/compiler-rt/lib external/compiler-rt/include
 LOCAL_CFLAGS += $(asan_rtl_cflags)
-LOCAL_SRC_FILES := asan_android_stub.cc
+LOCAL_SRC_FILES := asan_preinit.cc
+#LOCAL_SRC_FILES := asan_android_stub.cc asan_preinit.cc
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -148,7 +150,9 @@
         external/stlport/stlport \
         external/gtest/include \
         external/compiler-rt/include \
-        external/compiler-rt/lib
+        external/compiler-rt/lib \
+	external/compiler-rt/lib/asan/tests \
+	external/compiler-rt/lib/sanitizer_common/tests
 LOCAL_CFLAGS += \
         -Wno-unused-parameter \
         -Wno-sign-compare \
@@ -172,7 +176,9 @@
         bionic \
         external/stlport/stlport \
         external/gtest/include \
-        external/compiler-rt/lib
+        external/compiler-rt/lib \
+	external/compiler-rt/lib/asan/tests \
+	external/compiler-rt/lib/sanitizer_common/tests
 LOCAL_CFLAGS += $(asan_test_cflags)
 LOCAL_SRC_FILES := $(asan_test_files)
 LOCAL_CPP_EXTENSION := .cc