Cleaned/Fixed Android project setup