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

Change-Id: If97579d2b6e2ca87cb45a8f7782cb872ccc63753