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