Reconcile with jb-mr2-release - do not merge

Change-Id: I1b72e802b0ea0288d030d54011a9af97e3cdd5fd
tree: 64ac8ad2fbb8fcc7aeea97111a0621ad521c7bc9
  1. hal/
  2. legacy/
  3. Android.mk