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