Merge "Use -Werror in frameworks/native/libs/gui and ui" am: c4ebf5bbab
am: 3a566dd1e1

Change-Id: I587295b82d5638e1b76d062f1374b49fc0214867