Merge pull request #815 from myzb/cm-11.0

added cherrypick 74856
Remove useless patch
Merge pull request #1 from LegacyXperia/cm-11.0

Remove useless patch