Add back some Cyanogenmod ifdefs