resolved conflicts for merge of 1bc98ccb to gingerbread-plus-aosp

Change-Id: Ief9ec3d0472660e26864e082e03c26e09a043b9d

diff --cc libc/Android.mk
index db8e7bd,71a8941..1981d0b
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -355,7 -308,10 +354,8 @@@ libc_common_src_files += 
        arch-arm/bionic/setjmp.S \
        arch-arm/bionic/sigsetjmp.S \
        arch-arm/bionic/strlen.c.arm \
+       arch-arm/bionic/strcpy.S \
        arch-arm/bionic/syscall.S \
 -      arch-arm/bionic/sigaction.c \
 -      arch-arm/bionic/__sig_restorer.S \
        string/memmove.c.arm \
        string/bcopy.c \
        string/strcmp.c \
@@@ -404,8 -357,9 +404,9 @@@ libc_common_src_files += 
        arch-x86/string/strcmp_wrapper.S \
        arch-x86/string/strncmp_wrapper.S \
        arch-x86/string/strlen_wrapper.S \
 -      bionic/pthread.c \
+       string/strcpy.c \
        bionic/pthread-atfork.c \
 +      bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c
  
@@@ -444,8 -395,9 +445,9 @@@ libc_common_src_files += 
        string/strncmp.c \
        string/memcmp.c \
        string/strlen.c \
 -      bionic/pthread.c \
+       string/strcpy.c \
        bionic/pthread-atfork.c \
 +      bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c \
        unistd/socketcalls.c