Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 03d33e1..6c29482 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -41,14 +41,13 @@
libstagefright_soft_amrdec \
libstagefright_soft_amrnbenc \
libstagefright_soft_amrwbenc \
- libstagefright_soft_avcdec \
- libstagefright_soft_avcenc \
libstagefright_soft_flacenc \
libstagefright_soft_g711dec \
libstagefright_soft_gsmdec \
+ libstagefright_soft_h264dec \
+ libstagefright_soft_h264enc \
libstagefright_soft_hevcdec \
libstagefright_soft_mp3dec \
- libstagefright_soft_mpeg2dec \
libstagefright_soft_mpeg4dec \
libstagefright_soft_mpeg4enc \
libstagefright_soft_opusdec \