Merge "Enable qcmediaplayer to compile for msm8610 target."