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