Merge "Use -Werror in frameworks/native/cmds/surfacereplayer/proto"