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

Change-Id: Ibf0557791cb735f0920730101d0d1cf9c0005530