Merge "defconfig: msm9625: Add CONFIG_SOUND"