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