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

Change-Id: Iec1b8e5a08062de149abf40ae8facb97987c7f67
tree: eaa9f0a95e4b1003a38d7d34d6e50a263e41616a
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk