Merge "MediaPlayer2: fix sdk docs"