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

Change-Id: I6b612a1fff0da31b16c1121d0f3d08abf407336c