Merge "Unhide the android.media.[Media]DataSource interface."