Merge "Force icu4c to always default to the Gregorian calendar."