Reconcile with jb-mr2-release - do not merge

Change-Id: Ib89e9670cf7e277b9b5d0563cf3f9e72e9e59834
tree: 16c0b2fde4589fcbd6d271b6b7a9192349001d96
  1. hal/
  2. legacy/
  3. voice_processing/
  4. Android.mk