Merge "hwcomposer: Fix compiler warnings"