Merge "Totally remove Unicode.cpp and rely on ICU"