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

Change-Id: I14088a6f375f279fda1d37894975d28186c69c08