small refactor
android builder refactor