d2spr: Switch to local d2-common

Change-Id: I179fa0a9fb07a15d822172afc70fc8446b0f7db7