Merge "Use -Werror in frameworks/native/opengl/libs"