Solving the Multi-Agent Path Finding with Waypoints Problem Using Subdimensional Expansion