Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 2d4e92a7f5 am: fd259e4fce

Change-Id: I6f9ecdda68d263606534e2e1e91a7641d970dac4
tree: 4596cf1609074a5b6f44c28fa0022e995d73a9d0
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk
  7. OWNERS