Merge pull request #1 from ivanich/cm-11.0

media-caf: Avoid collision with FFMPEG plugin
media-legacy: Add support for qsd8k
Media-legacy: I was wrong, qsd8k uses prebuilt OMX
mm-video: port heap mask change to ion.