am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should...
am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
* commit 'd7d5049d':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE