Merge "Switch libnativehelper from statfs to statvfs."