Merge "Enable -Werror in launch control builds"