Merge changes from topic "xfrmi-support"

* changes:
  Cleanup and update comments for output mark
  Add fallback logic and enable XFRM-I support in netd
  Add XFRM-I support to XfrmController
  Add XFRM Interface creation logic
  Always set additional fwmark bits in output mark