am a3783569: Merge "Add ST_* constants to OsConstants"

* commit 'a378356955bcaf7be9434e8babed1b106f741a00':
  Add ST_* constants to OsConstants