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

Change-Id: I529db9786afca459da51ec886f7e672743038bb9