Updated to fix with lastest Xamarin.Android