Merge "media: omx: reorganize makefiles into a common defaults for soft OMX" into qt-dev