am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s...
am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev
* commit '8c16943e':
Fix CalledFromWrongThreadException in MediaPlayer's subtitle support