Merge "MediaPlayer2: add back convenient API's for current data source."