[android] Switch to new single-header modulemap for Bionic too

Author: finagolfin

stdlib/public/Platform/CMakeLists.txt

@@ -130,9 +130,7 @@ foreach(sdk ${SWIFT_SDKS})
     set(module_dir "${SWIFTLIB_DIR}/${arch_subdir}")
     set(module_dir_static "${SWIFTSTATICLIB_DIR}/${arch_subdir}")
 
-    if(${sdk} STREQUAL ANDROID)
-      set(glibc_modulemap_source "bionic.modulemap.gyb")
-    elseif(${sdk} STREQUAL OPENBSD)
+    if(${sdk} STREQUAL OPENBSD)
       set(glibc_modulemap_source "libc-openbsd.modulemap.gyb")
     else()
       set(glibc_modulemap_source "glibc.modulemap.gyb")

stdlib/public/Platform/SwiftGlibc.h.gyb

@@ -28,7 +28,6 @@ headers = [
   'tgmath.h',
   'time.h',
   'utmp.h',
-  'utmpx.h',
 
   # POSIX
   'aio.h',