am 129a6ccb: Merge "The MediaExtractor can now unselect tracks and has more...
am 129a6ccb: Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev
* commit '129a6ccb':
The MediaExtractor can now unselect tracks and has more control over seeking.