Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am: ebc3c9ca3f
am: 3ed59e2fda

Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153