d2: Clean up obsolete d2-common and d2 variants due to unified d2.

Change-Id: Ib939efe31ac528bb85479b56793406956689e8bc