Merge "Have Golem generate ICU .dat files in /system/etc/icu on target." am: 95e49e7743
am: 9f56fee7fd

Change-Id: I6b573fb7032df70cbc487b36da9c88ae55b831c1