more refactoring of android installer