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

Change-Id: I39e4a9ddd100d04d94b7dc2d4a4233dd00988ea6