cm11: vendom/cm: Rebase patch