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