Merge "stagefright: prefer B frames for high frame-rate recording" into nyc-mr1-dev