Gardening M37 : First round of compilation fixes for Android