Remove d2to1 dependency

Change-Id: I48cd05a5b333f729216284a78cec9e79756ad659