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

Change-Id: Ibc59f353f658ec618ae429bdd888c5837f6a0bc3