Merge "Redirect /system/lib/libicuuc.so regardless of duplication in /system" am: 54c86405 am: e1c7bac9 am: c0425cc7 Change-Id: I0da705b3195981cf49ea621269ccd3994bc3eebf