Merge "Enable -Werror in launch control builds" am: 5d3110410c am: 84d16a0eb4 am...