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

Change-Id: I253c3e7726ec0f53a4f9cd558bc681360c1c6bfd