Merge "Revert "Add android.hardware.neuralnetworks@1.3"" am: eccca6c246 am: b393327ccb am: 99f0abb4d9
am: 14e9629af7

Change-Id: Iaaa966036c9002340026a4a7b069480102d6e43e
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index d7d8955..441778a 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -106,6 +106,8 @@
 	"libaudioutils",
 	"libbinder",
 	"libcamera_metadata",
+	"libcodec2_hidl@1.0",
+	"libcodec2_vndk",
 	"libcrypto",
 	"libdiskconfig",
 	"libdumpstateutil",
@@ -129,6 +131,7 @@
 	"libsqlite",
 	"libssl",
 	"libstagefright_amrnb_common",
+	"libstagefright_bufferpool@2.0",
 	"libstagefright_bufferqueue_helper",
 	"libstagefright_enc_common",
 	"libstagefright_flacdec",
@@ -156,6 +159,7 @@
 	"libstagefright_soft_vorbisdec",
 	"libstagefright_soft_vpxdec",
 	"libstagefright_soft_vpxenc",
+	"libstagefright_softomx",
 	"libstagefright_xmlparser",
 	"libsysutils",
 	"libtinyxml2",