bowser: cleanup #ifdef/#ifndef in dss

Change-Id: Ifbad9b7e3ca7c4d3aa20696507d799baead1f97e
Merge remote-tracking branch 'kfire/cm-10.1' into cm-10.1-exp