android dev removed - submodule mess