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