Merge "Add sdkext module" am: 5685159a7c am: 2e36b2a95d

Change-Id: Iedbe3897736a7e9c7b29a2ceb5ae3e7bc020f0b6

target/product/base_system.mk

@@ -60,6 +60,7 @@ PRODUCT_PACKAGES += \
     com.android.media.swcodec \
     com.android.resolv \
     com.android.neuralnetworks \
+    com.android.sdkext \
     com.android.tzdata \
     com.android.wifi \
     ContactsProvider \
@@ -326,13 +327,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 \