Reconcile with jb-mr2-release - do not merge

Change-Id: Ide8e99ec794b6436156f491beed44ffc3440a7c3
tree: cbb8580da17f4350d0dfd8650a7af6d58a3fa612
  1. hal/
  2. legacy/
  3. Android.mk