d2vzw: Switch to local d2-common

Change-Id: Ibd6883f4558b879b6defae48a5362efa799c7a78