Revert "d2-common: Change a few props to match stock build.props."

This reverts commit 1c734ce9952854590acd27ada977812899fe45f2.