Merge commit '744043fc' into eclair-mr2-plus-aosp * commit '744043fc': Update FileSource to also accept a file descriptor and a range.