Merge "MediaPlayer2: clean up setDataSource"