am 1cd0e202: Reconcile with jb-mr2-release - do not merge

* commit '1cd0e20269fb5faf6cd85e338b7370648a95f8ef':
tree: b434273c2c13c59465c67b6575c58cd6fba43b8f
  1. hal/
  2. legacy/
  3. Android.mk