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