Reconcile with jb-mr2-release - do not merge

Change-Id: I46e32f210b004047f9b3714595cbdea459eafedd
tree: 9b13770e53b6efa2fee92a2733baecc249a7fbd7
  1. hal/
  2. legacy/
  3. voice_processing/
  4. Android.mk