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

* commit '7c794b165975c1d21753a46282dd3ea6da26fcb0':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"