diff --git a/libc/Android.bp b/libc/Android.bp
index 807073a..c7d2923 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -833,12 +833,117 @@
 cc_library_static {
     defaults: ["libc_defaults"],
     srcs: [
+        "bionic/NetdClientDispatch.cpp",
+        "bionic/__bionic_get_shell_path.cpp",
+        "bionic/__cmsg_nxthdr.cpp",
+        "bionic/__cxa_thread_atexit_impl.cpp",
+        "bionic/__errno.cpp",
+        "bionic/__gnu_basename.cpp",
+        "bionic/__libc_current_sigrtmax.cpp",
+        "bionic/__libc_current_sigrtmin.cpp",
+        "bionic/abort.cpp",
+        "bionic/accept.cpp",
+        "bionic/access.cpp",
         "bionic/android_set_abort_message.cpp",
         "bionic/android_unsafe_frame_pointer_chase.cpp",
+        "bionic/arpa_inet.cpp",
+        "bionic/assert.cpp",
         "bionic/atexit.cpp",
+        "bionic/atof.cpp",
+        "bionic/bionic_allocator.cpp",
+        "bionic/bionic_arc4random.cpp",
         "bionic/bionic_elf_tls.cpp",
-        "bionic/__cxa_thread_atexit_impl.cpp",
+        "bionic/bionic_futex.cpp",
+        "bionic/bionic_netlink.cpp",
+        "bionic/bionic_systrace.cpp",
+        "bionic/bionic_time_conversions.cpp",
+        "bionic/brk.cpp",
+        "bionic/c16rtomb.cpp",
+        "bionic/c32rtomb.cpp",
+        "bionic/chmod.cpp",
+        "bionic/chown.cpp",
+        "bionic/clearenv.cpp",
+        "bionic/clock.cpp",
+        "bionic/clock_getcpuclockid.cpp",
+        "bionic/clock_nanosleep.cpp",
+        "bionic/clone.cpp",
+        "bionic/ctype.cpp",
+        "bionic/dirent.cpp",
+        "bionic/dup.cpp",
+        "bionic/environ.cpp",
+        "bionic/error.cpp",
+        "bionic/eventfd.cpp",
+        "bionic/exec.cpp",
+        "bionic/execinfo.cpp",
+        "bionic/faccessat.cpp",
+        "bionic/fchmod.cpp",
+        "bionic/fchmodat.cpp",
+        "bionic/fcntl.cpp",
+        "bionic/fdsan.cpp",
+        "bionic/fdtrack.cpp",
+        "bionic/ffs.cpp",
+        "bionic/fgetxattr.cpp",
+        "bionic/flistxattr.cpp",
         "bionic/fork.cpp",
+        "bionic/fpclassify.cpp",
+        "bionic/fsetxattr.cpp",
+        "bionic/ftruncate.cpp",
+        "bionic/ftw.cpp",
+        "bionic/futimens.cpp",
+        "bionic/getcwd.cpp",
+        "bionic/getdomainname.cpp",
+        "bionic/getentropy.cpp",
+        "bionic/gethostname.cpp",
+        "bionic/getloadavg.cpp",
+        "bionic/getpagesize.cpp",
+        "bionic/getpgrp.cpp",
+        "bionic/getpid.cpp",
+        "bionic/getpriority.cpp",
+        "bionic/gettid.cpp",
+        "bionic/get_device_api_level.cpp",
+        "bionic/grp_pwd.cpp",
+        "bionic/grp_pwd_file.cpp",
+        "bionic/heap_zero_init.cpp",
+        "bionic/iconv.cpp",
+        "bionic/icu_wrappers.cpp",
+        "bionic/ifaddrs.cpp",
+        "bionic/inotify_init.cpp",
+        "bionic/ioctl.cpp",
+        "bionic/killpg.cpp",
+        "bionic/langinfo.cpp",
+        "bionic/lchown.cpp",
+        "bionic/lfs64_support.cpp",
+        "bionic/libc_init_common.cpp",
+        "bionic/libgen.cpp",
+        "bionic/link.cpp",
+        "bionic/locale.cpp",
+        "bionic/lockf.cpp",
+        "bionic/lstat.cpp",
+        "bionic/mblen.cpp",
+        "bionic/mbrtoc16.cpp",
+        "bionic/mbrtoc32.cpp",
+        "bionic/mempcpy.cpp",
+        "bionic/memset_explicit.cpp",
+        "bionic/mkdir.cpp",
+        "bionic/mkfifo.cpp",
+        "bionic/mknod.cpp",
+        "bionic/mntent.cpp",
+        "bionic/mremap.cpp",
+        "bionic/net_if.cpp",
+        "bionic/netdb.cpp",
+        "bionic/netinet_in.cpp",
+        "bionic/nl_types.cpp",
+        "bionic/open.cpp",
+        "bionic/pathconf.cpp",
+        "bionic/pause.cpp",
+        "bionic/pidfd.cpp",
+        "bionic/pipe.cpp",
+        "bionic/poll.cpp",
+        "bionic/posix_fadvise.cpp",
+        "bionic/posix_fallocate.cpp",
+        "bionic/posix_madvise.cpp",
+        "bionic/posix_timers.cpp",
+        "bionic/preadv_pwritev.cpp",
         "bionic/pthread_atfork.cpp",
         "bionic/pthread_attr.cpp",
         "bionic/pthread_barrier.cpp",
@@ -862,10 +967,82 @@
         "bionic/pthread_setname_np.cpp",
         "bionic/pthread_setschedparam.cpp",
         "bionic/pthread_spinlock.cpp",
+        "bionic/ptrace.cpp",
+        "bionic/pty.cpp",
+        "bionic/raise.cpp",
+        "bionic/rand.cpp",
+        "bionic/readlink.cpp",
+        "bionic/realpath.cpp",
+        "bionic/reboot.cpp",
+        "bionic/recv.cpp",
+        "bionic/recvmsg.cpp",
+        "bionic/rename.cpp",
+        "bionic/rmdir.cpp",
+        "bionic/scandir.cpp",
+        "bionic/sched_getaffinity.cpp",
+        "bionic/sched_getcpu.cpp",
+        "bionic/semaphore.cpp",
+        "bionic/send.cpp",
+        "bionic/setegid.cpp",
+        "bionic/seteuid.cpp",
         "bionic/setjmp_cookie.cpp",
+        "bionic/setpgrp.cpp",
+        "bionic/sigaction.cpp",
+        "bionic/signal.cpp",
+        "bionic/sigprocmask.cpp",
+        "bionic/sleep.cpp",
+        "bionic/socketpair.cpp",
+        "bionic/spawn.cpp",
+        "bionic/stat.cpp",
+        "bionic/stdlib_l.cpp",
+        "bionic/strerror.cpp",
+        "bionic/string_l.cpp",
+        "bionic/strings_l.cpp",
+        "bionic/strsignal.cpp",
+        "bionic/strtol.cpp",
+        "bionic/strtold.cpp",
+        "bionic/swab.cpp",
+        "bionic/symlink.cpp",
+        "bionic/sync_file_range.cpp",
         "bionic/sysconf.cpp",
+        "bionic/sys_epoll.cpp",
+        "bionic/sys_msg.cpp",
+        "bionic/sys_sem.cpp",
+        "bionic/sys_shm.cpp",
+        "bionic/sys_signalfd.cpp",
+        "bionic/sys_statfs.cpp",
+        "bionic/sys_statvfs.cpp",
         "bionic/sys_thread_properties.cpp",
+        "bionic/sys_time.cpp",
+        "bionic/sysinfo.cpp",
+        "bionic/syslog.cpp",
+        "bionic/system.cpp",
+        "bionic/system_property_api.cpp",
+        "bionic/system_property_set.cpp",
+        "bionic/tdestroy.cpp",
+        "bionic/termios.cpp",
+        "bionic/thread_private.cpp",
+        "bionic/threads.cpp",
+        "bionic/time.cpp",
+        "bionic/time_l.cpp",
+        "bionic/tmpfile.cpp",
+        "bionic/umount.cpp",
+        "bionic/unlink.cpp",
+        "bionic/usleep.cpp",
+        "bionic/utmp.cpp",
         "bionic/vdso.cpp",
+        "bionic/wait.cpp",
+        "bionic/wchar.cpp",
+        "bionic/wchar_l.cpp",
+        "bionic/wcstod.cpp",
+        "bionic/wctype.cpp",
+        "bionic/wcwidth.cpp",
+        "bionic/wmempcpy.cpp",
+
+        // TODO: why isn't this in a static-libc-only module?
+        // This contains a weak stub implementation of __find_icu_symbol for wctype.cpp,
+        // which will be overridden by the actual one in libc.so.
+        "bionic/icu_static.cpp",
     ],
 
     arch: {
@@ -1074,6 +1251,20 @@
         },
     },
 
+    // TODO: move to libc/bionic/legacy_32_bit_support.cpp or #if __LP64__ instead.
+    multilib: {
+        lib32: {
+            srcs: ["bionic/mmap.cpp"],
+        },
+    },
+
+    local_include_dirs: ["stdio"],
+    generated_headers: ["generated_android_ids"],
+
+    whole_static_libs: [
+        "libsystemproperties",
+    ],
+
     cppflags: ["-Wold-style-cast"],
     include_dirs: ["bionic/libstdc++/include"],
     name: "libc_bionic",
@@ -1088,208 +1279,6 @@
 }
 
 // ========================================================
-// libc_bionic_ndk.a- The portions of libc_bionic that can
-// be safely used in libc_ndk.a (no troublesome global data
-// or constructors).
-// ========================================================
-cc_library_static {
-    defaults: ["libc_defaults"],
-    srcs: [
-        "bionic/NetdClientDispatch.cpp",
-        "bionic/__bionic_get_shell_path.cpp",
-        "bionic/__cmsg_nxthdr.cpp",
-        "bionic/__errno.cpp",
-        "bionic/__gnu_basename.cpp",
-        "bionic/__libc_current_sigrtmax.cpp",
-        "bionic/__libc_current_sigrtmin.cpp",
-        "bionic/abort.cpp",
-        "bionic/accept.cpp",
-        "bionic/access.cpp",
-        "bionic/arpa_inet.cpp",
-        "bionic/assert.cpp",
-        "bionic/atof.cpp",
-        "bionic/bionic_allocator.cpp",
-        "bionic/bionic_arc4random.cpp",
-        "bionic/bionic_futex.cpp",
-        "bionic/bionic_netlink.cpp",
-        "bionic/bionic_systrace.cpp",
-        "bionic/bionic_time_conversions.cpp",
-        "bionic/brk.cpp",
-        "bionic/c16rtomb.cpp",
-        "bionic/c32rtomb.cpp",
-        "bionic/chmod.cpp",
-        "bionic/chown.cpp",
-        "bionic/clearenv.cpp",
-        "bionic/clock.cpp",
-        "bionic/clock_getcpuclockid.cpp",
-        "bionic/clock_nanosleep.cpp",
-        "bionic/clone.cpp",
-        "bionic/ctype.cpp",
-        "bionic/dirent.cpp",
-        "bionic/dup.cpp",
-        "bionic/environ.cpp",
-        "bionic/error.cpp",
-        "bionic/eventfd.cpp",
-        "bionic/exec.cpp",
-        "bionic/execinfo.cpp",
-        "bionic/faccessat.cpp",
-        "bionic/fchmod.cpp",
-        "bionic/fchmodat.cpp",
-        "bionic/fcntl.cpp",
-        "bionic/fdsan.cpp",
-        "bionic/fdtrack.cpp",
-        "bionic/ffs.cpp",
-        "bionic/fgetxattr.cpp",
-        "bionic/flistxattr.cpp",
-        "bionic/fpclassify.cpp",
-        "bionic/fsetxattr.cpp",
-        "bionic/ftruncate.cpp",
-        "bionic/ftw.cpp",
-        "bionic/futimens.cpp",
-        "bionic/getcwd.cpp",
-        "bionic/getdomainname.cpp",
-        "bionic/getentropy.cpp",
-        "bionic/gethostname.cpp",
-        "bionic/getloadavg.cpp",
-        "bionic/getpagesize.cpp",
-        "bionic/getpgrp.cpp",
-        "bionic/getpid.cpp",
-        "bionic/getpriority.cpp",
-        "bionic/gettid.cpp",
-        "bionic/get_device_api_level.cpp",
-        "bionic/grp_pwd.cpp",
-        "bionic/grp_pwd_file.cpp",
-        "bionic/heap_zero_init.cpp",
-        "bionic/iconv.cpp",
-        "bionic/icu_wrappers.cpp",
-        "bionic/ifaddrs.cpp",
-        "bionic/inotify_init.cpp",
-        "bionic/ioctl.cpp",
-        "bionic/killpg.cpp",
-        "bionic/langinfo.cpp",
-        "bionic/lchown.cpp",
-        "bionic/lfs64_support.cpp",
-        "bionic/libc_init_common.cpp",
-        "bionic/libgen.cpp",
-        "bionic/link.cpp",
-        "bionic/locale.cpp",
-        "bionic/lockf.cpp",
-        "bionic/lstat.cpp",
-        "bionic/mblen.cpp",
-        "bionic/mbrtoc16.cpp",
-        "bionic/mbrtoc32.cpp",
-        "bionic/mempcpy.cpp",
-        "bionic/memset_explicit.cpp",
-        "bionic/mkdir.cpp",
-        "bionic/mkfifo.cpp",
-        "bionic/mknod.cpp",
-        "bionic/mntent.cpp",
-        "bionic/mremap.cpp",
-        "bionic/net_if.cpp",
-        "bionic/netdb.cpp",
-        "bionic/netinet_in.cpp",
-        "bionic/nl_types.cpp",
-        "bionic/open.cpp",
-        "bionic/pathconf.cpp",
-        "bionic/pause.cpp",
-        "bionic/pidfd.cpp",
-        "bionic/pipe.cpp",
-        "bionic/poll.cpp",
-        "bionic/posix_fadvise.cpp",
-        "bionic/posix_fallocate.cpp",
-        "bionic/posix_madvise.cpp",
-        "bionic/posix_timers.cpp",
-        "bionic/preadv_pwritev.cpp",
-        "bionic/ptrace.cpp",
-        "bionic/pty.cpp",
-        "bionic/raise.cpp",
-        "bionic/rand.cpp",
-        "bionic/readlink.cpp",
-        "bionic/realpath.cpp",
-        "bionic/reboot.cpp",
-        "bionic/recv.cpp",
-        "bionic/recvmsg.cpp",
-        "bionic/rename.cpp",
-        "bionic/rmdir.cpp",
-        "bionic/scandir.cpp",
-        "bionic/sched_getaffinity.cpp",
-        "bionic/sched_getcpu.cpp",
-        "bionic/semaphore.cpp",
-        "bionic/send.cpp",
-        "bionic/setegid.cpp",
-        "bionic/seteuid.cpp",
-        "bionic/setpgrp.cpp",
-        "bionic/sigaction.cpp",
-        "bionic/signal.cpp",
-        "bionic/sigprocmask.cpp",
-        "bionic/sleep.cpp",
-        "bionic/socketpair.cpp",
-        "bionic/spawn.cpp",
-        "bionic/stat.cpp",
-        "bionic/stdlib_l.cpp",
-        "bionic/strerror.cpp",
-        "bionic/string_l.cpp",
-        "bionic/strings_l.cpp",
-        "bionic/strsignal.cpp",
-        "bionic/strtol.cpp",
-        "bionic/strtold.cpp",
-        "bionic/swab.cpp",
-        "bionic/symlink.cpp",
-        "bionic/sync_file_range.cpp",
-        "bionic/sys_epoll.cpp",
-        "bionic/sys_msg.cpp",
-        "bionic/sys_sem.cpp",
-        "bionic/sys_shm.cpp",
-        "bionic/sys_signalfd.cpp",
-        "bionic/sys_statfs.cpp",
-        "bionic/sys_statvfs.cpp",
-        "bionic/sys_time.cpp",
-        "bionic/sysinfo.cpp",
-        "bionic/syslog.cpp",
-        "bionic/system.cpp",
-        "bionic/system_property_api.cpp",
-        "bionic/system_property_set.cpp",
-        "bionic/tdestroy.cpp",
-        "bionic/termios.cpp",
-        "bionic/thread_private.cpp",
-        "bionic/threads.cpp",
-        "bionic/time.cpp",
-        "bionic/time_l.cpp",
-        "bionic/tmpfile.cpp",
-        "bionic/umount.cpp",
-        "bionic/unlink.cpp",
-        "bionic/usleep.cpp",
-        "bionic/utmp.cpp",
-        "bionic/wait.cpp",
-        "bionic/wchar.cpp",
-        "bionic/wchar_l.cpp",
-        "bionic/wcstod.cpp",
-        "bionic/wctype.cpp",
-        "bionic/wcwidth.cpp",
-        "bionic/wmempcpy.cpp",
-
-        // This contains a weak stub implementation of __find_icu_symbol for wctype.cpp,
-        // which will be overridden by the actual one in libc.so.
-        "bionic/icu_static.cpp",
-    ],
-
-    multilib: {
-        lib32: {
-            // LP32 cruft
-            srcs: ["bionic/mmap.cpp"],
-        },
-    },
-    whole_static_libs: [
-        "libsystemproperties",
-    ],
-    cppflags: ["-Wold-style-cast"],
-    local_include_dirs: ["stdio"],
-    include_dirs: ["bionic/libstdc++/include"],
-    name: "libc_bionic_ndk",
-    generated_headers: ["generated_android_ids"],
-}
-
-// ========================================================
 // libc_syscalls.a
 // ========================================================
 
@@ -1393,7 +1382,6 @@
         "libarm-optimized-routines-string",
         "libasync_safe",
         "libc_bionic",
-        "libc_bionic_ndk",
         "libc_bootstrap",
         "libc_dns",
         "libc_fortify",