Merge "Optimize strcat/strcpy, small tweaks to strlen."