resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e

diff --cc libc/Android.mk
index 5e9d677,a403146..6c535dc
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -485,14 -478,9 +485,17 @@@ ifeq ($(TARGET_ARCH),arm
    ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
      libc_common_cflags += -DHAVE_ARM_TLS_REGISTER
    endif
 +  #
 +  # Define HAVE_32_BYTE_CACHE_LINES to indicate to C
 +  # library it should use to 32-byte version of memcpy, and not
 +  # the 64-byte version.
 +  #
 +  ifeq ($(ARCH_ARM_HAVE_32_BYTE_CACHE_LINES),true)
 +    libc_common_cflags += -DHAVE_32_BYTE_CACHE_LINE
 +  endif
+   ifeq ($(ARCH_ARM_USE_NON_NEON_MEMCPY),true)
+     libc_common_cflags += -DARCH_ARM_USE_NON_NEON_MEMCPY
+   endif
  else # !arm
    ifeq ($(TARGET_ARCH),x86)
      libc_crt_target_cflags :=

diff --cc libc/arch-arm/bionic/memcpy.S
Simple merge