d2-common: clean-up ifdefs for d2 stepbrothers

Change-Id: I18ede5ed73d7de1dade7c1129dc372bc921c8f09
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_device_samsung_d2-common into jb3