Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""