Merge "stagefright: always add pts info if max pts gap is set" into nyc-mr1-dev