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

Change-Id: I35464fb674a8c9984dc85416b14b1a008eae2305