fix compile issues with CyanogenMod-based defconfig
block: consolidate patches for ROW scheduler and urgent scheduling