am 3721a7e7: am 7115c802: Merge "Fix pread/pwrite for LP64."

* commit '3721a7e71fc831f6d58b7253627043d0658ad977':
  Fix pread/pwrite for LP64.

diff --cc libc/Android.mk
index 5baf381,190272e..c3ee617
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -104,10 -104,8 +104,9 @@@ libc_common_src_files := 
        bionic/md5.c \
        bionic/memmem.c \
        bionic/memswap.c \
 +      bionic/name_mem.c \
        bionic/pathconf.c \
        bionic/perror.c \
-       bionic/pread.c \
        bionic/ptsname.c \
        bionic/ptsname_r.c \
        bionic/pututline.c \