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