Merge "Use -Werror in frameworks/native/services"