Merge "Use -Werror in frameworks/native/services" am: 9099430db7
am: 3b225d1274

Change-Id: I5afe360f1b7b3537c25a503fc2bb452f9a531933