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

Change-Id: I43e9235edc846c1f17c466b571c5a9596bc213a6