am 94a68ecf: Merge "Bug fix: MediaPlayer\'s deselectTrack() for subtitle." into jb-mr1-dev

* commit '94a68ecf2b56bd56994d0352cbaad56e58dcf0dc':
  Bug fix: MediaPlayer's deselectTrack() for subtitle.