am a2b951c4: am d0024fbd: (-s ours) DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror

* commit 'a2b951c4c9ca1210e942916bc890664149ee61d5':
  DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror