d2-common: fix ifeq's for apex/express

Change-Id: I09e8d95a6540fde333df48b7620b9ef67cf25b85
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0