Improve android project setup