Remove d2to1 dependency

Change-Id: I9e91070e61e00cbc7d99ff223e85c3c371f60566