am 3f6b86a5: am e1d13d9e: Merge commit \'1ed341977485618189efe926120b291f0df3d33a\' into HEAD

* commit '3f6b86a5baf26c621e65bb25fb2c671764ddc479':
tree: 1ae96be0e3baff80f17cac0c0c7803a3e250eb94
  1. hal/
  2. legacy/
  3. visualizer/
  4. voice_processing/
  5. Android.mk