Reconcile with jb-mr2-zeroday-release - do not merge

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