Reconcile with jb-mr2-release - do not merge

Change-Id: Id502924260eb89508aa4e926328ef6b6d97b4b5b
tree: 3d7b9f6ac5ad0ef0605fc64c439e37c53e395982
  1. hal/
  2. legacy/
  3. Android.mk