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

Change-Id: I66a68bf9fac987bca5c4defd45e95bff3006aa9d