Merge "stagefright: discard audio at start of capture" into jb-mr1-dev