Merge \\"stagefright: correctly calculate and configure P, B and I-frame...
Merge \\"stagefright: correctly calculate and configure P, B and I-frame spacing\\" into nyc-mr1-dev am: b00a831c
am: fc33e401
Change-Id: I035bcac140004f1af5c14d2dae8506df2aeca3f0