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

Merge commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d'

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