merge in jb-mr2-release history after reset to jb-mr2-dev
tree: c41fe139ac72e0b274ad6ad90086b67331333158
  1. hal/
  2. legacy/
  3. voice_processing/
  4. Android.mk