Merge changes I9130f997,I1c4e8c92

* changes:
  Clear incoming packet mark rules on netd startup.
  Use new-style UID routing.