Revert "switch to d2-common, add 3.4 wcnss"

This reverts commit 145c09ebe388e1c88ca6ad4901e16b00aad4da62.