Merge "MediaPlayer2: clean up setNextDataSource/s"