Move d2to1 more into the source tree

When we merged in d2to1, we kept it separate, but I don't think there
is a great benefit to doing that.

Change-Id: I3972b3132619e8e2dd7e362ca5fe9d1e3add43b8
Merge "Move d2to1 more into the source tree"