Even more android

Fix and improve mnit for Android.