Merge "MediaPlayer2: fix setPlaybackParams"