media: enable Codec 2.0 by default again

This reverts commit 596250cb84.

Reason for revert: we can disable on cuttlefish specifically

Bug: 129710438
Change-Id: I65bc168661f46314a0263e6aab77c7f6f1b5953f

media/codec2/sfplugin/Codec2InfoBuilder.cpp

@@ -313,7 +313,7 @@ status_t Codec2InfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) {
     //
     // Note: Currently, OMX components have default rank 0x100, while all
     // Codec2.0 software components have default rank 0x200.
-    int option = ::android::base::GetIntProperty("debug.stagefright.ccodec", 1);
+    int option = ::android::base::GetIntProperty("debug.stagefright.ccodec", 4);
 
     // Obtain Codec2Client
     std::vector<Traits> traits = Codec2Client::ListComponents();

media/libstagefright/StagefrightPluginLoader.cpp

@@ -35,7 +35,7 @@ constexpr const char kCCodecPluginPath[] = "libsfplugin_ccodec.so";
 }  // unnamed namespace
 
 StagefrightPluginLoader::StagefrightPluginLoader(const char *libPath) {
-    if (android::base::GetIntProperty("debug.media.codec2", 0) == 0) {
+    if (android::base::GetIntProperty("debug.stagefright.ccodec", 1) == 0) {
         ALOGD("CCodec is disabled.");
         return;
     }