diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 4c0bf46..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (C) 2015 The Android Open Source 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.
-//
-
-android_app {
-    name: "CarLensPickerApp",
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
-    platform_apis: true,
-    overrides: [
-        "Launcher2",
-        "Launcher3",
-        "Launcher3QuickStep",
-    ],
-    static_libs: ["androidx.car_car"],
-    optimize: {
-        enabled: false,
-    },
-    dex_preopt: {
-        enabled: false,
-    },
-    certificate: "platform",
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
-    required: ["privapp_whitelist_com.android.car.lenspicker"]
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..8b7ea70
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2015 The Android Open Source 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.
+#
+
+ifneq ($(TARGET_BUILD_PDK), true)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_USE_AAPT2 := true
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CarLensPickerApp
+
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_OVERRIDES_PACKAGES += Launcher2 Launcher3 Launcher3QuickStep
+
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.car.lenspicker
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_ANDROID_LIBRARIES += androidx.car_car
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
+
+endif
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index 0800b4c..0000000
--- a/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default code reviewers picked from top 3 or more developers.
-# Please update this list if you find better candidates.
-ajchen@google.com
-nicksauer@google.com