am 1c3da619: am 0f0e6f10: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '1c3da6197c677339cfdd41a948a5f79f804d6e4e'

* commit '1c3da6197c677339cfdd41a948a5f79f804d6e4e':
  The ICU data is no longer compiled directly into the shared library.