Merge "Fix statvfs tests for the host."