Merge "Add ST_* constants to OsConstants"