Reconcile with jb-mr2-release - do not merge

Change-Id: I30773b20dfe3913483382ba0c9d0c75749e398bc
tree: d6f40be5e8f46e481d2b00ad5e4c6a58b320138b
  1. hal/
  2. legacy/
  3. Android.mk