Merge branch 'cm-10.2' of github.com:TheMuppets/proprietary_vendor_lge into cm-10.2

Change-Id: I16cb9e4416be5a62aefc4a3b9a7b28cd99163b0e