Nintendo to combine portable, home console dev teams