Merge "mediaplayer2: rename getMediaPlayer2State to getState"