Merging android-dotfiles with these dotfiles