cm11: rebase msim frameworks/base patch