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

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