Merge "Use -Werror in frameworks/native/libs/nativewindow" am: 9d87e1b86c
am: 77ea102064

Change-Id: I76c75656601c90d4e1d41d6b301f67d142b936f6