Merge "For msm8996, add dep on sound_trigger.primary_headers" am: 60e731fa9f
am: e5d19bc0f1

Change-Id: I9c0da8b03b5fbed30979be2c00fb27d6e4a49e1a