Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"