Merge "MediaPlayer2: add getMediaPlayer2State"