am 9cdf6db5: am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev

* commit '9cdf6db50c0dab30f32291bf00c702ca79132674':
  stagefright: discard audio at start of capture