Merge "Use -Werror in frameworks/native/cmds/surfacereplayer/proto" am: 0f897ac6fa
am: e6e626df07

Change-Id: Ic98f1924f22b55caa908289be0f0d06f0cd0e350