Clean up various warnings in bionic.

Change-Id: Ic57541d0a567fd4ae79f0ad59b2ffde1130eb7d2
diff --git a/libc/Android.mk b/libc/Android.mk
index 3aced4e..c1716b1 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -67,13 +67,11 @@
     bionic/md5.c \
     bionic/memmem.c \
     bionic/memswap.c \
-    bionic/name_mem.c \
     bionic/pathconf.c \
     bionic/perror.c \
     bionic/ptsname.c \
     bionic/ptsname_r.c \
     bionic/pututline.c \
-    bionic/reboot.c \
     bionic/recv.c \
     bionic/sched_cpualloc.c \
     bionic/sched_cpucount.c \
@@ -212,6 +210,7 @@
     bionic/abort.cpp \
     bionic/access.cpp \
     bionic/assert.cpp \
+    bionic/__bionic_name_mem.cpp \
     bionic/bionic_time_conversions.cpp \
     bionic/brk.cpp \
     bionic/chmod.cpp \
@@ -268,6 +267,7 @@
     bionic/ptrace.cpp \
     bionic/raise.cpp \
     bionic/readlink.cpp \
+    bionic/reboot.cpp \
     bionic/rename.cpp \
     bionic/rmdir.cpp \
     bionic/sbrk.cpp \