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