Revert "Fix compiling warnings"

* We'll take the upstream fix

This reverts commit 2ba45029b40b4932fc112efb102dd6b59b757d8a.

Change-Id: I067db32fe72db2b177b55cf68562daf227931e7a
24 files changed