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

Change-Id: I72f26533024f4202b69cb8893288c38cc15dc95f