Refactor android distribution