Update patches

remove out patches that already is committed into cm-11
resolving conflict patch

Change-Id: I9c283c9672f86be85fd94e51c9c03d22d981a3fd