Merge "Use -Werror in frameworks/ex"
am: 5e99bdb567

Change-Id: I21dd3557361abeb08e078ff7e041e445247c5a66