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