refactoring and android build