android variants configuration refactored