Resolved conflicts for merge of de1d2252 to master

Change-Id: If44e4cfa8df812bceb8f39d9343530824cbf3b7c

diff --cc luni/src/main/native/sub.mk
index 73ceedb,f0287cf..e9240a9
--- 1/luni/src/main/native/sub.mk
--- 2/luni/src/main/native/sub.mk
+++ b/luni/src/main/native/sub.mk
@@@ -62,16 -28,7 +62,15 @@@ LOCAL_C_INCLUDES += 
  # be listed in libs/nativehelper/Android.mk.
  # TODO: fix this requirement
  
 -LOCAL_SHARED_LIBRARIES += libutils
 +LOCAL_SHARED_LIBRARIES += \
 +      libcrypto \
 +      libcutils \
 +      libexpat \
-       libicudata \
 +      libicuuc \
 +      libicui18n \
 +      libssl \
 +      libutils \
 +      libz
  
  LOCAL_STATIC_LIBRARIES += \
        libfdlibm