Merge code and metadata changes from upstream r603.

Main code change is to rename shortnumberutil to shortnumberinfo,
and add some new entrypoints therein.
Generated Python files for metadata