Fixed Android Project setup