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

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