android manifest finally refactored