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

Change-Id: Ia99830d3c2ffe68a05db21c56364f3fcd1965ac1