Added Android support again, work on backporting the example
applications, fixed some issues in the client