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

Change-Id: I58d1ea32015402ecb00787f14c0c3f2af482f5d2