Merge "fix MediaPlayerTest.testVideoSurfaceResetting()" into jb-dev