Merge "msm_vidc: Changes to enable Camcorder" into msm-3.4