Merge "stagefright: set PTS for SoftwareRenderer"