Merge "MediaPlayer2: fix MEDIA_INFO_DATA_SOURCE_* events"