Merge "Revert "Enable -Werror for vr/hardware_composer service""