Merge "Use -Werror in frameworks/native/opengl/libs" am: cefdd49b3f
am: 3d0b76041f

Change-Id: I9525f229071e872ae42a6b3029524c3721f8aa15