Fix android MDNS scanning merge, and re-flow the code
Small changes in android build setup.
android Don't stop mDNS discoverer on error. It crashes the service!
client: Fix android video playback.

Make it so setting the video output context works
again on Android so videos work.

Also some hacky and unsuccessful attempt to stop libsoup
crashing on shutdown on android.