Merge "Replace hard-coded errno values with OsConstants" am: cb299b858f
am: 6fa9cc1bd3

* commit '6fa9cc1bd3cdb0489452396f708d57e22f742bf7':
  Replace hard-coded errno values with OsConstants