[automerger skipped] Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data" into qt-dev
am: 28904625b8 -s ours
am skip reason: change_id Ifae52b554124514e433cfe78875643a7450fbabd with SHA1 32190f45e0 is in history

Change-Id: I0e55f93f668d6fbf3b6e34537fddb0ed25fc4d63