am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
  core_base.mk: switch to new H264 and MPEG2 software codecs