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