Merge "updater: Replace strtok() with android::base::Split()." am: d0acbb56ed
am: 26edcd8f5a

* commit '26edcd8f5a60ad80e98d8d289aa0130ba199c2a4':
  updater: Replace strtok() with android::base::Split().