Reconcile with jb-mr2-release - do not merge

Change-Id: I3cb51e82df9bd0f75f5a00820a6f71ddb23734bf
tree: c41fe139ac72e0b274ad6ad90086b67331333158
  1. hal/
  2. legacy/
  3. voice_processing/
  4. Android.mk