Merge "Revert "For msm8996, add dep on sound_trigger.primary_headers"" am: 4bc96ee9d6
am: ba9bce3617

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