d2-common: clean-up ifdefs for d2 stepbrothers

Change-Id: I18ede5ed73d7de1dade7c1129dc372bc921c8f09
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD