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

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