am c1d80272: am 08da5c1f: Merge "vold: replace strsep by strtok_r"

* commit 'c1d80272b117cf837de93fadd8d456d89a203e2f':
  vold: replace strsep by strtok_r