Merge "vold: fsync both file and directory after write keys"