Merge "MediaPlayer2: add DataSourceDesc for source dependent API's"