Merge "MediaPlayer: fix typo in stop() documentation"