Revert "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."

This reverts commit d5d7cebbca28f51df219537a49a35a70b9efbf1a.
fixing round 2