am a9d5c825: Reconcile with jb-mr2-release - do not merge

* commit 'a9d5c8259176af09e0d27d8941a5832069f862fc':
tree: a2ac3429cedaa9da6f974b0d11c31c852b81ff95
  1. hal/
  2. legacy/
  3. Android.mk