am 91ac2dc4: am aa71da43: am a3783569: Merge "Add ST_* constants to OsConstants"

* commit '91ac2dc4d83f1086f0e7cf86a4289c539de19f85':
  Add ST_* constants to OsConstants