Revert "cupid: Rename audio.primary.taro to audio.primary.taro-cupid to avoid conflicts"

This reverts commit c01516521ac0a753c5974857ee015770b93e9b40.

Change-Id: I6300bdf18f59131eb7400997b5bcabe0b7d3a831

Android.bp

@@ -3125,14 +3125,14 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "audio.primary.taro-cupid",
+	name: "audio.primary.taro",
 	owner: "xiaomi",
 	strip: {
 		none: true,
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/hw/audio.primary.taro-cupid.so"],
+			srcs: ["proprietary/vendor/lib64/hw/audio.primary.taro.so"],
 			shared_libs: ["libbase", "liblog", "libcutils", "libaudioutils", "libexpat", "libhidlbase", "libprocessgroup", "libutils", "libultrasound_notify", "libar-pal", "libresampler", "libhardware_legacy", "libaudiocloudctrl", "gyro_fusion_interface", "libstagefright_foundation", "libtinyalsa", "libxlog", "vendor.qti.hardware.pal@1.0", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
@@ -4401,7 +4401,7 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/vendor/lib64/libkaraokepal.so"],
-			shared_libs: ["libaudioroute", "libaudioutils", "libcutils", "libexpat", "liblog", "libar-pal", "audio.primary.taro-cupid", "libc++", "libc", "libm", "libdl", ],
+			shared_libs: ["libaudioroute", "libaudioutils", "libcutils", "libexpat", "liblog", "libar-pal", "audio.primary.taro", "libc++", "libc", "libm", "libdl", ],
 		},
 	},
 	compile_multilib: "64",

cupid-vendor.mk

@@ -790,7 +790,7 @@ PRODUCT_PACKAGES += \
     com.qualcomm.mcx.policy.mfl \
     com.qualcomm.mcx.policy.xr \
     com.qualcomm.qti.mcx.usecase.extension \
-    audio.primary.taro-cupid \
+    audio.primary.taro \
     camera.qcom \
     camera.xiaomi \
     com.qti.chi.override \