Merge "stagefright: correctly calculate and configure P, B and I-frame spacing" into nyc-mr1-dev