Merge branch 'cm-11.0' of https://github.com/markcs/proprietary_vendor_samsung-2 into cm-11.0
Merge branch 'cm-11.0' of https://github.com/markcs/proprietary_vendor_samsung-2 into cm-11.0