Fix up to buildable CyanogenMod 11.0