M38 Gardening : First round of compile fixes for Android