Fixed android project issues