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

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