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