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

* commit 'e78d87df3253516a93c1042beabe0edfe782a170':
tree: d6f40be5e8f46e481d2b00ad5e4c6a58b320138b
  1. hal/
  2. legacy/
  3. Android.mk