Reconcile with jb-mr2-release - do not merge

Change-Id: I480c3dcdb8b1541a9d463ed11a6a90f34535aacb
tree: a2ac3429cedaa9da6f974b0d11c31c852b81ff95
  1. hal/
  2. legacy/
  3. Android.mk