Update iOS and Android projects to build with latest code

This fixes the Xamarin.iOS and Xamarin.Android builds. This is dev branch -> dev branch.