Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data"
am: de725e6e75

Change-Id: Iff94f22ed4dc64e446e746982561f4750ea32347