Fixing error messages in the android git