Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev