Merge "MediaPlayer2: rename MediaPlayer2EventCallback to EventCallback"