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

Change-Id: I1ad5bfe655abc8b80e0f65b8076501e825b2387b