Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD

Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761

diff --cc libc/Android.mk
index af96503,770fbde..962365e
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -102,8 -104,13 +102,9 @@@ libc_common_src_files := 
        bionic/md5.c \
        bionic/memmem.c \
        bionic/memswap.c \
 -      bionic/openat.c \
 -      bionic/open.c \
+       bionic/name_mem.c \
        bionic/pathconf.c \
        bionic/perror.c \
 -      bionic/pread.c \
 -      bionic/pselect.c \
        bionic/ptsname.c \
        bionic/ptsname_r.c \
        bionic/pututline.c \

diff --cc libc/arch-arm/cortex-a15/bionic/memcpy_base.S
Simple merge

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

diff --cc tests/system_properties_test.cpp
Simple merge