Merge "Use -Werror in frameworks/native/opengl/tests"
am: 5de5abdef3

Change-Id: I6c830dccd375a8e982672f3b9e935ae5371f6122