Merge "vold: replace strsep by strtok_r"