Reconcile with jb-mr2-release - do not merge

Change-Id: Ic31e144dc752e8c259b9589e9f0804b2bf8d05b2
tree: b434273c2c13c59465c67b6575c58cd6fba43b8f
  1. hal/
  2. legacy/
  3. Android.mk