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

Change-Id: Iceb07f5af63f98f021ab32815b935f4789c596a5