Merge "stagefright: disable B-frames" into oc-mr1-dev