Merge "Revert "Fix build"" into nyc-dev
tree: 33c411d9aa5d047debe6e4fb27d13de4b521d83a
  1. hal/
  2. legacy/
  3. msm8909/
  4. post_proc/
  5. visualizer/
  6. voice_processing/
  7. Android.mk