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

Change-Id: I799b8f51cddc911e85452eb194eff03671e1402d