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

* commit '0ead0f50ac8a0fac329fdcb9b2d8fae74096b519':
  Bug fix: MediaPlayer's deselectTrack() for subtitle.