Merge "Use -Werror in frameworks/native/services/sensorservice" am: 860c8b4798 am: a566557418
am: 5c4527fc83

Change-Id: I9740680c2c93bb53f0118e0931deb97027d15233