Merge "Redirect /system/lib/libicuuc.so regardless of duplication in /system"
am: 54c864052b

Change-Id: Id077e161ed2a1d49c1bc865f67f81820120fdc53