Android builds refactored