Merge "MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting" into ics-mr1