small refactor
android builder refactor
Merge branch 'dev'