Merge "MediaPlayer2: fix and move CloseGuard checking to MediaPlayer2"