Merge branch 'dev/p/fp2/lineage-rebase' into int/p/fp2

* dev/p/fp2/lineage-rebase:
  Revert "Revert "Use new-style UID routing.""
  Revert "Revert "Set both legacy and new UID routing attributes.""
  Revert "Workaround mismatch between bionic and device kernel headers"

Issue: FP2P-656
Change-Id: I4b352f7e2e93dcff92df9d2535d0c251dc7a87af