Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev