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

Change-Id: I2c9764d6a227a32372b922c927b9276cea3b292b