Reconcile with jb-mr2-release - do not merge

Change-Id: I476bbd02389437601ba40b8c2436d8468cb5f892
tree: 33e98ac517ee16f4ec66c4a05fb7abf249a3cc52
  1. hal/
  2. legacy/
  3. Android.mk