Start removing unnecessary libc/Android.bp complexity.

Things have gotten way out of hand in here...

Test: treehugger
Change-Id: I0dc6f9369828578409d422f76cb48a4553472d3e
diff --git a/libc/Android.bp b/libc/Android.bp
index 61ef29d..363d28e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1080,6 +1080,7 @@
         "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",
@@ -1252,7 +1253,6 @@
         },
     },
     whole_static_libs: [
-        "libc_bionic_systrace",
         "libsystemproperties",
     ],
     cppflags: ["-Wold-style-cast"],
@@ -1263,18 +1263,6 @@
 }
 
 // ========================================================
-// libc_bionic_systrace.a
-// ========================================================
-
-cc_library_static {
-    name: "libc_bionic_systrace",
-    defaults: ["libc_defaults"],
-    srcs: [
-        "bionic/bionic_systrace.cpp",
-    ],
-}
-
-// ========================================================
 // libc_pthread.a - pthreads parts that previously lived in
 // libc_bionic.a. Relocated to their own library because
 // they can't be included in libc_ndk.a (as the layout of