libc: dont use the linaro strcpy

significant regression here:
Google:
1000000   * strcpy of 15000 bytes: 24.074554 seconds
100000000 * strcpy of 15 bytes:    7.468170 seconds
Linaro:
1000000   * strcpy of 15000 bytes: 63.671265 seconds
100000000 * strcpy of 15 bytes:    12.456329 seconds

Change-Id: I35b431db4d7c1e72adcd7570ab504f6f00179e74
diff --git a/libc/Android.mk b/libc/Android.mk
index 265cdb4..64f8cd9 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -355,6 +355,7 @@
 	arch-arm/bionic/memcmp16.S \
 	arch-arm/bionic/setjmp.S \
 	arch-arm/bionic/sigsetjmp.S \
+	arch-arm/bionic/strcpy.S \
 	arch-arm/bionic/strcmp.S \
 	arch-arm/bionic/syscall.S \
 	string/strncmp.c \
@@ -406,13 +407,11 @@
 libc_common_src_files += \
 	arch-arm/bionic/armv7/memchr.S \
 	arch-arm/bionic/armv7/strchr.S \
-	arch-arm/bionic/armv7/strcpy.c \
 	arch-arm/bionic/armv7/strlen.S
 else
 libc_common_src_files += \
 	string/memchr.c \
 	string/strchr.c \
-	arch-arm/bionic/strcpy.S \
 	arch-arm/bionic/strlen.c.arm
 endif