Merge "Fix brk/sbrk error checking."