Merge "Use -Werror in frameworks/native/opengl/libagl" am: d4f0d3a4d2
am: fe805e8913

Change-Id: Icb4254fabad368dbe5ea7fa534300e69e4027faf