Merge "Use -Werror in frameworks/native/libs/sensor"
am: 854116f657

Change-Id: I5f7a78d6e539c5a1e47b2717cb73878d006d6e61