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