Merge stage-dr1-aosp-master into stage-aosp-master
am: 68a7af9bac

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