Merge "MediaPlayer2: allow multiple EventCallback's"