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

Change-Id: Iebb239b911b0c699924efda4a0f9cc14139148fa