Merge "Adds a test case for MediaPlayer's deselectTrack()." into jb-mr1-dev