Merge "Revert "Fix build"" into nyc-dev
am: bcdb056

* commit 'bcdb056641790846f4588851374badd1862b51c2':
  Revert "Fix build"
tree: 0a3b8543a33e6353c3eab73367a3a885e73001e0
  1. hal/
  2. legacy/
  3. msm8909/
  4. post_proc/
  5. visualizer/
  6. voice_processing/
  7. Android.mk