Merge "Add portable support for stuct statfs and two functions."