Merge "run-as: turn on -Werror"