bring qcom-media up 2 speed with CM

Change-Id: I89e68189fb7037fb1baf1b172b508bb90456298e