Merge "Replace hard-coded errno values with OsConstants"