Cleanup libights module
More cleanup in liblight
Fix liblights
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2