Reconcile with jb-mr2-release - do not merge

Change-Id: If1ae235f07c2cfe4184e9a18d1fe110a54955e20
tree: ac27626cd7459857f86b04109a72f3f8f85dfce8
  1. hal/
  2. legacy/
  3. Android.mk