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

Change-Id: Ia17d11e10bb67284dda85d09dd25c678c2cf87f9