i9500: Remove deprecated defines

Change-Id: I34f846b6ac2a0850b97fc83b0253967ba395ebec
Merge branch 'cm-11.0' into kk_mkt