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

Change-Id: Iad2ff14f1b93e4d95548b7a4aab0745cd3af0ae4