Merge "Revert "For msm8996, add dep on sound_trigger.primary_headers""