Changes in cldr-annotations 31.0.1_1

Copy from release-31-0-1 (fujiwarat) c766eb0
Fix build issues (fujiwarat) 041437d