Fix bad merge.

Add host route for a default gateway before adding the default route.
Also fixing bug were "already active" condtion of APN failed to
propagate the default gateway info, resulting in a loss of that address.

bug:4175328
Change-Id: I38f9d108693382a43e6605d56ca3963adf4eb6f4