Merge changes Ib068ffc9,I4154659c

* changes:
  bpf_shared.h - split clatd portion out into clatd.h
  bpf_tethering.h -> offload.h