Merge latest changes from Nicolas Dufresne / Collabora

Merge from
   git://git.collabora.co.uk/git/user/nicolas/android-aurena.git
Adds support for Android 4.1 mDNS API to do server autodiscovery
android: Fix typo in previous merge
Fix Android build for code earlier rearranging
android: Add simple Makefile for fixed GStreamer SDK location