Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev