Merge "Fixed usages of strtok to use strtok_r instead"