diff --git a/Android.bp b/Android.bp
index a13f929..0c8123e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -262,6 +262,22 @@ cc_library {
     vendor: true
 }
 
+cc_library {
+    name: "libc_mutexdestroy_shim",
+    shared_libs: ["libc"],
+    srcs: ["libc/pthread_mutex_destroy.cpp"],
+    sanitize: { never: true },
+    stl: "none",
+    vendor: true
+}
+
+cc_library {
+    name: "libc_pthreadts_shim",
+    shared_libs: ["libc"],
+    srcs: ["libc/pthread_cond_timedwait.cpp"],
+    vendor: true
+}
+
 cc_library {
     name: "libcamera_metadata_shim",
     shared_libs: ["libcamera_metadata"],
diff --git a/libc/Android.mk b/libc/Android.mk
deleted file mode 100644
index bdd4e17..0000000
--- a/libc/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2013-2016, The CyanogenMod Project
-# Copyright (C) 2018, The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-    bionic/pthread_mutex_destroy.cpp
-LOCAL_SHARED_LIBRARIES := libc
-LOCAL_MODULE := libshim_mutexdestroy
-LOCAL_VENDOR_MODULE := true
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TAGS := optional
-LOCAL_32_BIT_ONLY := true
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-    bionic/pthread_cond_timedwait.cpp
-LOCAL_SHARED_LIBRARIES := libc
-LOCAL_MODULE := libshim_pthreadts
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libc/bionic/pthread_cond_timedwait.cpp b/libc/pthread_cond_timedwait.cpp
similarity index 100%
rename from libc/bionic/pthread_cond_timedwait.cpp
rename to libc/pthread_cond_timedwait.cpp
diff --git a/libc/bionic/pthread_mutex_destroy.cpp b/libc/pthread_mutex_destroy.cpp
similarity index 100%
rename from libc/bionic/pthread_mutex_destroy.cpp
rename to libc/pthread_mutex_destroy.cpp