Merge "Switch libcore from statfs to statvfs."