Merge "media: fix javadoc for MediaDataSource"