Merge branch 'jb_2.6_1' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.2

Change-Id: I13b3f4f319d0e9b2719aed814860f3381cdafb47

Conflicts:
	dashplayer/Android.mk
	dashplayer/DashCodec.cpp
	dashplayer/DashPlayer.cpp
	dashplayer/DashPlayer.h
	dashplayer/DashPlayerDriver.cpp
	dashplayer/DashPlayerDriver.h
	libc2dcolorconvert/C2DColorConverter.cpp
	mm-core/inc/OMX_QCOMExtns.h
	mm-video/vidc/vdec/inc/omx_vdec.h
	mm-video/vidc/vdec/src/omx_vdec.cpp
	mm-video/vidc/venc/inc/omx_video_base.h
	mm-video/vidc/venc/inc/video_encoder_device.h
	mm-video/vidc/venc/src/omx_video_base.cpp
	mm-video/vidc/venc/src/omx_video_encoder.cpp
	mm-video/vidc/venc/src/video_encoder_device.cpp