Build the adbd apex.

Test: adb shell "su 0 readlink /proc/\`pidof adbd\`/exe"
Change-Id: I29227a79765fca8f0f2601f0fefa6f01232fbc6f
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 41f6f22..a00be5a 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -16,7 +16,6 @@
 
 # Base modules and settings for the system partition.
 PRODUCT_PACKAGES += \
-    adbd \
     adbd_system_binaries \
     am \
     android.hidl.allocator@1.0-service \
@@ -48,6 +47,7 @@
     cgroups.json \
     charger \
     cmd \
+    com.android.adbd \
     com.android.apex.cts.shim.v1_prebuilt \
     com.android.conscrypt \
     com.android.i18n \