Merge "Use the new libicu.so provided in the NDK"