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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build