Merge pull request #2842 from akoeplinger/fix-monodroid-build