[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 51d2db037a -s ours am: 24e499ccf5 am: 5b420a7d9e

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