Merge pull request #2059 from mcrosson/android-feature-external_player