Merge "MediaPlayer2: fix doc"