Merge "MediaPlayer2: remove stop and related enums"