Merge "Add sdkext module"

am: 5685159a7c

Change-Id: Ib84f6be56b6e2ee821b73a6dd1dbdba113b5ee41

target/product/base_system.mk

@@ -57,6 +57,7 @@ PRODUCT_PACKAGES += \
     com.android.media.swcodec \
     com.android.resolv \
     com.android.neuralnetworks \
+    com.android.sdkext \
     com.android.tzdata \
     ContactsProvider \
     content \
@@ -323,13 +324,15 @@ PRODUCT_BOOT_JARS := \
     telephony-common \
     voip-common \
     ims-common \
+    framework-sdkext \
     ike \
     updatable-media
 
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.conscrypt:conscrypt \
     com.android.ipsec:ike \
-    com.android.media:updatable-media
+    com.android.media:updatable-media \
+    com.android.sdkext:framework-sdkext
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \