Merge "stagefright: fix issues with bitrate handling" into nyc-dev