Merge "hqd: Fix Klocwork errors in liblight"