am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp

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