am 3d2fc269: (-s ours) Merge "Revert "DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror"" into klp-dev

* commit '3d2fc2698608ff005d822470d07b31ec4e4f7528':
  Revert "DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror"