Updates for Mono.Android.v4 -> Xamarin.Android.v4 Component switch - following up to #2