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

Change-Id: Ie7d68a69490ef5c05d67c78eba26f5856b075f9e