Android and Mono build fixes
Merge pull request #520 from JonCanning/master

Android and MonoTouch build fixes