merge from open-source master

Change-Id: I6a15428fd9ce1f1dbbb702ff13c6af8da8f54a1e
diff --git a/libc/Android.mk b/libc/Android.mk
index cbb10c5..50a8cab 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -502,6 +502,10 @@
 		$(LOCAL_PATH)/string  \
 		$(LOCAL_PATH)/stdio
 
+# Needed to access private/__dso_handle.S from
+# crtbegin_xxx.S and crtend_xxx.S
+#
+libc_crt_target_cflags += -I$(LOCAL_PATH)/private
 
 # Define the libc run-time (crt) support object files that must be built,
 # which are needed to build all other objects (shared/static libs and