Merge d2-common into apexqtmo

Since d2-common is pointless. It does not track anything upstream, and we don't do anything with d2, so it just adds maintenance burden.