Merge "Fixes for icu4c 51."