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