Merge "Add a symlink for the ICU .dat file"
am: 792fd03955

Change-Id: I448e65f17ed1d01a79646ce2b6c5f23293b3fc46